mirror of
https://github.com/lacerta-doc/Lacerta.git
synced 2026-11-07 19:47:36 +00:00
Compare commits
644
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4235030986 | ||
|
|
c60fedeb87 | ||
|
|
2f18134581 | ||
|
|
4101f75685 | ||
|
|
184771c92d | ||
|
|
3e12f1222b | ||
|
|
29f2749cb7 | ||
|
|
244b2fb123 | ||
|
|
725d541316 | ||
|
|
fc712a131a | ||
|
|
cc7b0dc5d1 | ||
|
|
169a6c6e0a | ||
|
|
42eb3d4c80 | ||
|
|
1c87b73a5b | ||
|
|
46f119b531 | ||
|
|
def799bbe6 | ||
|
|
defc051436 | ||
|
|
de9b68de87 | ||
|
|
802e4cc75a | ||
|
|
abc91b79ee | ||
|
|
b601b28f81 | ||
|
|
853ac1eca3 | ||
|
|
834bc35318 | ||
|
|
1e3a3262a4 | ||
|
|
475c511d32 | ||
|
|
474d6417c9 | ||
|
|
c7e141b892 | ||
|
|
3d2cc5ac05 | ||
|
|
73c310ee01 | ||
|
|
5c3d811979 | ||
|
|
f5bc740f58 | ||
|
|
8a57331d32 | ||
|
|
abdca108d4 | ||
|
|
8b66646e7d | ||
|
|
c9160a2df0 | ||
|
|
c5b0a33720 | ||
|
|
13f31017f7 | ||
|
|
e6778e6214 | ||
|
|
71f9be77cd | ||
|
|
e0d63122bd | ||
|
|
1c3fdf921d | ||
|
|
d07e63f534 | ||
|
|
5160411c76 | ||
|
|
20d30e338e | ||
|
|
3be6185c21 | ||
|
|
c82952f397 | ||
|
|
8c9dc14f16 | ||
|
|
d22644e37a | ||
|
|
c80576d046 | ||
|
|
b7cb4369d1 | ||
|
|
2cfab24c76 | ||
|
|
55b34d964c | ||
|
|
744a2bef65 | ||
|
|
74becab37b | ||
|
|
58d6ae17c6 | ||
|
|
dea5f240f0 | ||
|
|
119771a7f9 | ||
|
|
b6a30d5cbf | ||
|
|
2ec4b96c14 | ||
|
|
151911d0b2 | ||
|
|
d832438f8f | ||
|
|
0487553f3b | ||
|
|
678c9730ef | ||
|
|
e1b43a5f22 | ||
|
|
d384347e0a | ||
|
|
8faaf1e84a | ||
|
|
a81d79a972 | ||
|
|
1e2f48e0ae | ||
|
|
be7bd6b6fc | ||
|
|
16eb6d083e | ||
|
|
4de33b9550 | ||
|
|
b4d94954b9 | ||
|
|
526ab97706 | ||
|
|
6f0af7c4eb | ||
|
|
c6d85471c6 | ||
|
|
c5d7224b40 | ||
|
|
cc62529224 | ||
|
|
2d686ce776 | ||
|
|
a61c044391 | ||
|
|
bc19dd22d8 | ||
|
|
61ed1bbf79 | ||
|
|
fd785d9334 | ||
|
|
e6ce3571bf | ||
|
|
462ea77e91 | ||
|
|
faf0971ffe | ||
|
|
3eac0cf49c | ||
|
|
680b101476 | ||
|
|
8200a03168 | ||
|
|
290795d3aa | ||
|
|
1e1f014e59 | ||
|
|
20f6333dcc | ||
|
|
d30e68b23f | ||
|
|
24e54ec0f0 | ||
|
|
d01f5b9c79 | ||
|
|
8502bcdcab | ||
|
|
7c91987c76 | ||
|
|
74aef19312 | ||
|
|
2168f67fea | ||
|
|
380e8117b8 | ||
|
|
a6aeb5480a | ||
|
|
78505c62e6 | ||
|
|
467d5ae9ee | ||
|
|
0f4b66eb37 | ||
|
|
cec7f3bb15 | ||
|
|
1137604515 | ||
|
|
091467d113 | ||
|
|
aefe5d1001 | ||
|
|
d780e57e39 | ||
|
|
35b998eebe | ||
|
|
b99efb3336 | ||
|
|
9ebf656274 | ||
|
|
84a8d0d44d | ||
|
|
5b1461ff26 | ||
|
|
57ca804b2b | ||
|
|
b81f8d5c87 | ||
|
|
e44313d418 | ||
|
|
334d1ccba2 | ||
|
|
5bf55ada0e | ||
|
|
75c0700144 | ||
|
|
dbb737d896 | ||
|
|
3045c75c45 | ||
|
|
aac94922df | ||
|
|
78ff41b3e3 | ||
|
|
e026da96fa | ||
|
|
9245981233 | ||
|
|
bc74ee605e | ||
|
|
475e378b7c | ||
|
|
6c8233536c | ||
|
|
3878c139af | ||
|
|
56a3acf36d | ||
|
|
0cab05c581 | ||
|
|
9db85bb9b3 | ||
|
|
17cb2829ce | ||
|
|
397c923cc1 | ||
|
|
94cec3432e | ||
|
|
e78ee829ce | ||
|
|
4ae2a9fe3a | ||
|
|
d6a0dbeaa2 | ||
|
|
98c3820679 | ||
|
|
de85626d66 | ||
|
|
7e20d8e443 | ||
|
|
eba02abfd4 | ||
|
|
aa7f285773 | ||
|
|
e5e1b3a2bb | ||
|
|
cd5a588545 | ||
|
|
bd5a041424 | ||
|
|
9d793c3c0a | ||
|
|
0d4f0686b7 | ||
|
|
5e6fa45fed | ||
|
|
885cd77d5b | ||
|
|
cbd7c103c5 | ||
|
|
ddd303fa88 | ||
|
|
14fbb56dcd | ||
|
|
bf01610eb5 | ||
|
|
b63e2dd862 | ||
|
|
8f0f95d8af | ||
|
|
d75ecff0e7 | ||
|
|
bc20c92d44 | ||
|
|
5837a1a2d3 | ||
|
|
176d8da59d | ||
|
|
dc516bc083 | ||
|
|
5c83c8fe13 | ||
|
|
200af1955b | ||
|
|
951ee15235 | ||
|
|
9a35c218b3 | ||
|
|
52894cf19c | ||
|
|
656d3a5964 | ||
|
|
f95a2d64c3 | ||
|
|
92f9cfe4aa | ||
|
|
162f0a7bdb | ||
|
|
ba119fdb3d | ||
|
|
c711ad304b | ||
|
|
b2a619629f | ||
|
|
a3426b6620 | ||
|
|
a9fb6283e7 | ||
|
|
6153e944eb | ||
|
|
a0baaf02cb | ||
|
|
623be098d1 | ||
|
|
999de728f0 | ||
|
|
a032b9c1b1 | ||
|
|
34de82cec3 | ||
|
|
fb4ba28391 | ||
|
|
44baef8199 | ||
|
|
60f86cd9a2 | ||
|
|
add140ad39 | ||
|
|
4c40f9926e | ||
|
|
f119264599 | ||
|
|
7f7e7d4af3 | ||
|
|
b99277082d | ||
|
|
a6167b98af | ||
|
|
f75594233f | ||
|
|
32ee755d08 | ||
|
|
0758b697a2 | ||
|
|
1abfcc1e62 | ||
|
|
a1b6ed81df | ||
|
|
00a141a101 | ||
|
|
6845e552ef | ||
|
|
f98614c5f2 | ||
|
|
b040e2572c | ||
|
|
3eb94cade0 | ||
|
|
e9b7ad4d92 | ||
|
|
e07cbda769 | ||
|
|
80aeb8811b | ||
|
|
2d7dfe1b5b | ||
|
|
362eda782d | ||
|
|
b51eeb50ac | ||
|
|
2673fb6bce | ||
|
|
bb5c38cbca | ||
|
|
3f4614cf6b | ||
|
|
dc65cdbac8 | ||
|
|
dbbdda79f4 | ||
|
|
20c0dbd371 | ||
|
|
ccaed8387a | ||
|
|
bfb6bee14a | ||
|
|
3b283c1b05 | ||
|
|
e718e13ed9 | ||
|
|
8277258760 | ||
|
|
062e8c8bf9 | ||
|
|
0439370bd0 | ||
|
|
541b748501 | ||
|
|
88546fe89a | ||
|
|
53b3ebebef | ||
|
|
a7195c4079 | ||
|
|
e848f40b8b | ||
|
|
578f1ef8a8 | ||
|
|
fca44e1753 | ||
|
|
da1dba5fda | ||
|
|
c614230744 | ||
|
|
e5c3b3aa92 | ||
|
|
442ac4866a | ||
|
|
8d00386f20 | ||
|
|
9a14b1db23 | ||
|
|
385f2f327d | ||
|
|
f09d35b8c0 | ||
|
|
002c78d09b | ||
|
|
171c8b380c | ||
|
|
04651f3b8e | ||
|
|
180428fbb7 | ||
|
|
955e9fa6c8 | ||
|
|
1d3015a7e4 | ||
|
|
4ce8315678 | ||
|
|
3c66480f0f | ||
|
|
82d0187a11 | ||
|
|
dc340f1a96 | ||
|
|
1d24467c09 | ||
|
|
bf385b952c | ||
|
|
da207fe251 | ||
|
|
e7ababe65a | ||
|
|
cbf56dd331 | ||
|
|
1a360057b6 | ||
|
|
bc8e68126b | ||
|
|
ccb4dc4bb6 | ||
|
|
2690eec511 | ||
|
|
8eee8843b7 | ||
|
|
e8f51d3717 | ||
|
|
c2aada949e | ||
|
|
9725c1a07c | ||
|
|
1090e1bf74 | ||
|
|
a9b76161b7 | ||
|
|
37af356c92 | ||
|
|
af4513212d | ||
|
|
3f58c623f3 | ||
|
|
a754198d75 | ||
|
|
8ee554d445 | ||
|
|
c346170a9d | ||
|
|
5bd84e730f | ||
|
|
9a56846e3a | ||
|
|
8cd49804ca | ||
|
|
993f34e1fe | ||
|
|
81ceaaf0d6 | ||
|
|
d77cedc68f | ||
|
|
283146a81f | ||
|
|
dc4879c900 | ||
|
|
2f6bd99572 | ||
|
|
527d3c309f | ||
|
|
f326771aaf | ||
|
|
d2ebed3934 | ||
|
|
3cd1f50f34 | ||
|
|
c663d78e11 | ||
|
|
bb36458c4d | ||
|
|
7107b03de9 | ||
|
|
db4da7812b | ||
|
|
a6ee0c12f4 | ||
|
|
f9f07972ac | ||
|
|
e8876cec73 | ||
|
|
01f0d74ab6 | ||
|
|
1036cbe5d9 | ||
|
|
b1886438e1 | ||
|
|
5bc54f6083 | ||
|
|
f937503840 | ||
|
|
9f41632b0f | ||
|
|
fb2ba1e6e5 | ||
|
|
3930ec6d9c | ||
|
|
ca61d2c055 | ||
|
|
451e8532d1 | ||
|
|
8314f850f6 | ||
|
|
78ad88206c | ||
|
|
5dcb27a2e9 | ||
|
|
f833465dc8 | ||
|
|
4ac03fd4f3 | ||
|
|
17b2392fea | ||
|
|
68f2ba3b59 | ||
|
|
91bbca54ff | ||
|
|
19dfa070fd | ||
|
|
b7f55ef0db | ||
|
|
1c91b52431 | ||
|
|
1b85845499 | ||
|
|
523008ff3f | ||
|
|
50c2b1dc4d | ||
|
|
ae8f7ef1f1 | ||
|
|
27766effc1 | ||
|
|
f7fe8b35b1 | ||
|
|
87c4738f37 | ||
|
|
96bfca0550 | ||
|
|
0140c0376b | ||
|
|
89a3a179bd | ||
|
|
ff905d9280 | ||
|
|
4b0ea02f16 | ||
|
|
ca37a97e2f | ||
|
|
217f096a38 | ||
|
|
0c59c85b28 | ||
|
|
e3a5dee36c | ||
|
|
1805cd7d73 | ||
|
|
513a91b41e | ||
|
|
3f2534b1eb | ||
|
|
af836ed486 | ||
|
|
fe3d332a36 | ||
|
|
5fb938c263 | ||
|
|
3cafa05b27 | ||
|
|
9065ee1e1f | ||
|
|
36ecb3ab13 | ||
|
|
01e111bdd5 | ||
|
|
65a25ad228 | ||
|
|
1efac1ffb6 | ||
|
|
c05d45afdd | ||
|
|
27aa6a2f15 | ||
|
|
1b676f8368 | ||
|
|
30ed65079b | ||
|
|
943ca1daf5 | ||
|
|
8913f8118d | ||
|
|
4cf3ff5f3c | ||
|
|
360580eff2 | ||
|
|
730640425f | ||
|
|
69b60944b4 | ||
|
|
e8804e8f84 | ||
|
|
7951bef6e0 | ||
|
|
fbde892f40 | ||
|
|
022e7e278a | ||
|
|
d88c9c2030 | ||
|
|
e055f8fe9e | ||
|
|
1af344a6d3 | ||
|
|
f3ac07e633 | ||
|
|
a887446d21 | ||
|
|
b3a4207762 | ||
|
|
0439a998e3 | ||
|
|
a2eb04e96b | ||
|
|
b0c97da382 | ||
|
|
3a9053e987 | ||
|
|
7cdb005ebb | ||
|
|
3a270cdc9f | ||
|
|
f380e7eef8 | ||
|
|
8ca642c7f4 | ||
|
|
c28d94e417 | ||
|
|
8587c6a707 | ||
|
|
f3465bcf81 | ||
|
|
3e2a295a22 | ||
|
|
f36dc05db1 | ||
|
|
78525d634a | ||
|
|
0736a7326a | ||
|
|
76f4a6c228 | ||
|
|
3a41c4e105 | ||
|
|
301678658c | ||
|
|
e20b3f4a35 | ||
|
|
e0a344bb48 | ||
|
|
a2eda32183 | ||
|
|
0f8b71e739 | ||
|
|
91fe39d141 | ||
|
|
0dced5d0dc | ||
|
|
9e5b2dad46 | ||
|
|
5c931ece3f | ||
|
|
3b861e3a07 | ||
|
|
37497cb1ea | ||
|
|
3efaf30b95 | ||
|
|
9142696fac | ||
|
|
d5cf2f31d6 | ||
|
|
fcda369a2e | ||
|
|
9faf5c9055 | ||
|
|
0d78f9fa7c | ||
|
|
8ebc96fa98 | ||
|
|
2b8766db0a | ||
|
|
2233bb1a35 | ||
|
|
c513b44e8d | ||
|
|
cc35d8a5ea | ||
|
|
16ac36dd4f | ||
|
|
eadd65a334 | ||
|
|
3ed835ef2f | ||
|
|
4a66ed786d | ||
|
|
89e2f15a29 | ||
|
|
717b8e9637 | ||
|
|
3e24896bd1 | ||
|
|
94943184c4 | ||
|
|
30f2dc39ae | ||
|
|
4621025e62 | ||
|
|
164527d41a | ||
|
|
d770ac76aa | ||
|
|
642f306ad6 | ||
|
|
930b48af2f | ||
|
|
3205923eb5 | ||
|
|
441479d9b9 | ||
|
|
099d900ffd | ||
|
|
080e86d05d | ||
|
|
6d6f4790a0 | ||
|
|
1a31d63786 | ||
|
|
ce834a7cfd | ||
|
|
f7b8006fa4 | ||
|
|
5bb2f0d387 | ||
|
|
e54cc07e9d | ||
|
|
bc5d0edd68 | ||
|
|
3540f20c46 | ||
|
|
164b6ea6d4 | ||
|
|
8fdefb9850 | ||
|
|
8e4018beb0 | ||
|
|
ddd2b097e6 | ||
|
|
9fe646fad8 | ||
|
|
5e1d1f6a76 | ||
|
|
649d6ccfdc | ||
|
|
dccb3090e1 | ||
|
|
de4a501c3f | ||
|
|
28b5f97c31 | ||
|
|
4656914203 | ||
|
|
1996d8dc4a | ||
|
|
dec4983bfc | ||
|
|
88dfae7d37 | ||
|
|
48101190a2 | ||
|
|
2b79c7669f | ||
|
|
3b6d88bafd | ||
|
|
a439bbd888 | ||
|
|
3453d224e1 | ||
|
|
b75759b650 | ||
|
|
a78cac8178 | ||
|
|
a42ef8f4fc | ||
|
|
5c16ea6e21 | ||
|
|
f000addbce | ||
|
|
73fa8201d6 | ||
|
|
5c0fd4fdbb | ||
|
|
6e514b216a | ||
|
|
59ba2cdcfc | ||
|
|
b3be0b9e21 | ||
|
|
a836410cbd | ||
|
|
15d454690e | ||
|
|
2ba243ea4a | ||
|
|
52657fdbbd | ||
|
|
88cd58f920 | ||
|
|
1ee0a1b8ea | ||
|
|
656482e968 | ||
|
|
efc16423d4 | ||
|
|
38db65c9d3 | ||
|
|
31a0220b90 | ||
|
|
5cb57997b8 | ||
|
|
0fade2c41b | ||
|
|
5a0b215626 | ||
|
|
49775a1f49 | ||
|
|
552f0e42b5 | ||
|
|
b8e70cd015 | ||
|
|
67350639c7 | ||
|
|
eb6a13baba | ||
|
|
bd0a16bec6 | ||
|
|
1019b1d035 | ||
|
|
2f0460a9ea | ||
|
|
2b4a24de7c | ||
|
|
b683c311df | ||
|
|
4bbb119729 | ||
|
|
8c714d5193 | ||
|
|
f441a957f7 | ||
|
|
dfe5c36e9e | ||
|
|
c54967f016 | ||
|
|
95beda8cc2 | ||
|
|
02d72ffa68 | ||
|
|
b159db97bb | ||
|
|
1653da9c94 | ||
|
|
1b00f2c64e | ||
|
|
de668412fc | ||
|
|
07042f4e91 | ||
|
|
78c36df105 | ||
|
|
14837f83cc | ||
|
|
4fd490ee12 | ||
|
|
d453c0705f | ||
|
|
aca90aa6e1 | ||
|
|
f52d00f930 | ||
|
|
9b70adecac | ||
|
|
80c5bca179 | ||
|
|
0a639d4b05 | ||
|
|
3ed6f7b5a6 | ||
|
|
f86dc981b4 | ||
|
|
c9eda4837b | ||
|
|
4d72fc10bf | ||
|
|
c9a594763d | ||
|
|
5a93b79b07 | ||
|
|
8a5cbe7b18 | ||
|
|
ca153f5602 | ||
|
|
73f553cff3 | ||
|
|
bd1a1d56cb | ||
|
|
b98fa18cae | ||
|
|
4875394417 | ||
|
|
b675e7ffa9 | ||
|
|
453fa4c4cf | ||
|
|
ce3565c082 | ||
|
|
523a66429e | ||
|
|
b7062a4942 | ||
|
|
43c7f4ae0f | ||
|
|
77702b9da5 | ||
|
|
d2950ab781 | ||
|
|
4aefae6b51 | ||
|
|
f2ed0515f8 | ||
|
|
b30834479e | ||
|
|
aa0728e97b | ||
|
|
3affd2dd2f | ||
|
|
9534e36a9d | ||
|
|
3bfcc9fd63 | ||
|
|
e3186249a0 | ||
|
|
c8517ad814 | ||
|
|
ffb6ebb358 | ||
|
|
a4db519fcf | ||
|
|
5ff6ac32ba | ||
|
|
bc06438811 | ||
|
|
6adcbf81c6 | ||
|
|
bc24ec45af | ||
|
|
ca3b4d78a5 | ||
|
|
c1b8722b82 | ||
|
|
646627ac49 | ||
|
|
6a98deab83 | ||
|
|
92b48336ac | ||
|
|
81d545b90b | ||
|
|
9daccbb084 | ||
|
|
a47d652275 | ||
|
|
e55b5709dd | ||
|
|
9fc5d160ac | ||
|
|
544b09dc39 | ||
|
|
bc42d59471 | ||
|
|
5d46fc3e81 | ||
|
|
9a17910862 | ||
|
|
8441b88ab3 | ||
|
|
92d147ab65 | ||
|
|
1eee31316a | ||
|
|
302eccfdfe | ||
|
|
93d1fa3f19 | ||
|
|
2154e67178 | ||
|
|
de9b78035a | ||
|
|
7cb5b1ca7c | ||
|
|
85c419c3ea | ||
|
|
685bdd56f8 | ||
|
|
a32ea3568f | ||
|
|
275cd77f53 | ||
|
|
a8274d3882 | ||
|
|
8b0b58ce99 | ||
|
|
eeb5387cdf | ||
|
|
41d5f8d71f | ||
|
|
b90ef6a487 | ||
|
|
734f6eb41d | ||
|
|
4f762627cf | ||
|
|
85a1f8a505 | ||
|
|
98232dc403 | ||
|
|
e925893ad2 | ||
|
|
2f21ecd6bd | ||
|
|
d203b1b76e | ||
|
|
a15383d420 | ||
|
|
6433b9a1ae | ||
|
|
1a1446ac62 | ||
|
|
60544c7905 | ||
|
|
7e7d72f903 | ||
|
|
5a468e37f9 | ||
|
|
25cbc32ef9 | ||
|
|
310944f51e | ||
|
|
c90715b0f5 | ||
|
|
effdd8e9f3 | ||
|
|
b07d370e69 | ||
|
|
f51313411b | ||
|
|
c183327842 | ||
|
|
95d9af1281 | ||
|
|
413c42fdc1 | ||
|
|
7eca8e9528 | ||
|
|
a0deb45fa0 | ||
|
|
e19198446b | ||
|
|
e0fe27eadd | ||
|
|
83707f8bec | ||
|
|
c3d9bb0cf9 | ||
|
|
39d356841b | ||
|
|
4db67a59d7 | ||
|
|
26f5968a4a | ||
|
|
6be44cd9b5 | ||
|
|
54f2076eda | ||
|
|
c31a590ce3 | ||
|
|
21f2f55531 | ||
|
|
02f1ac13cf | ||
|
|
e0f634fcb6 | ||
|
|
69a0b392ff | ||
|
|
0d42dc3461 | ||
|
|
2aa6bf8c5b | ||
|
|
123145b6a8 | ||
|
|
e723174b81 | ||
|
|
c1b3c06a9d | ||
|
|
2402936a19 | ||
|
|
ba87fb283e | ||
|
|
c35c4e829e | ||
|
|
017748b4a6 | ||
|
|
a23010b535 | ||
|
|
29e0dca2c7 | ||
|
|
a1c87535c6 | ||
|
|
a0c4718b3a | ||
|
|
7c0d82f25c | ||
|
|
5f74123c63 | ||
|
|
d0543d89b9 | ||
|
|
fd74f5eab0 | ||
|
|
1bac068c8c | ||
|
|
bbad45fbbd | ||
|
|
f2dfd2ca56 | ||
|
|
e3d6826912 | ||
|
|
c2ee49d274 | ||
|
|
b28a939792 | ||
|
|
dd98602309 | ||
|
|
7ba70cc84b | ||
|
|
865d8b994c | ||
|
|
1c5325711a | ||
|
|
aff7af76d4 | ||
|
|
9fecefeb4e | ||
|
|
577453a4db | ||
|
|
814dfd23fa | ||
|
|
0309864d0b | ||
|
|
947c2aa2ab | ||
|
|
0f4ce1b9b1 | ||
|
|
8a851e4f11 | ||
|
|
a298247824 | ||
|
|
59e32fe696 | ||
|
|
15beb0af57 | ||
|
|
14e7fbd127 | ||
|
|
144ff7dfd2 | ||
|
|
d030847992 | ||
|
|
eb1ad1f4af | ||
|
|
fc048c9bd6 | ||
|
|
a5efab5838 | ||
|
|
f186064f6e | ||
|
|
59a35cbb4a | ||
|
|
a78e60416d | ||
|
|
ac5a950ce3 |
No files matched your search
@@ -0,0 +1,17 @@
|
||||
---
|
||||
name: 不具合用テンプレート
|
||||
about: 不具合用テンプレート
|
||||
title: "[BUG]: "
|
||||
labels: バグ
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
# 概要
|
||||
<!-- Issueの概要 -->
|
||||
|
||||
# 詳細
|
||||
<!-- バグの詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所(省略可) -->
|
||||
@@ -0,0 +1,17 @@
|
||||
---
|
||||
name: 改善用テンプレート
|
||||
about: 改善用テンプレート
|
||||
title: "[IMPROVE]"
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
# 概要
|
||||
<!-- Issueの概要 -->
|
||||
|
||||
# 詳細
|
||||
<!-- 改善内容の詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所(省略可) -->
|
||||
@@ -1,10 +1,20 @@
|
||||
---
|
||||
name: 新機能用テンプレート
|
||||
about: 新規開発Issue用テンプレート
|
||||
about: 新規能用テンプレート
|
||||
title: ''
|
||||
labels: ''
|
||||
labels: 新機能
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
WIP
|
||||
# 概要
|
||||
<!-- Issueの概要 -->
|
||||
|
||||
# 詳細
|
||||
<!-- 機能の詳細 -->
|
||||
|
||||
# 関連Issue
|
||||
<!-- 関連するIssueがあれば -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所(省略可) -->
|
||||
@@ -0,0 +1,18 @@
|
||||
# 概要
|
||||
<!-- PRの概要 -->
|
||||
|
||||
# 関連Issue
|
||||
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||
|
||||
# 詳細
|
||||
<!-- 詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所 -->
|
||||
|
||||
# チェック
|
||||
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||
- [ ] 機能として完成している
|
||||
- [ ] WIP(Work in progress: 作業中)
|
||||
- [ ] 正常にビルド/起動ができる
|
||||
- [ ] 既存の機能を壊していない
|
||||
Generated
-17
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<runningDeviceTargetSelectedWithDropDown>
|
||||
<Target>
|
||||
<type value="RUNNING_DEVICE_TARGET" />
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="SERIAL_NUMBER" />
|
||||
<value value="ZY227DCBHN" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</runningDeviceTargetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2023-12-21T04:53:14.729902700Z" />
|
||||
</component>
|
||||
</project>
|
||||
Generated
+1
-1
@@ -26,10 +26,10 @@
|
||||
<option value="$PROJECT_DIR$/model" />
|
||||
<option value="$PROJECT_DIR$/processor" />
|
||||
<option value="$PROJECT_DIR$/shared" />
|
||||
<option value="$PROJECT_DIR$/shared/icon" />
|
||||
<option value="$PROJECT_DIR$/shared/ui" />
|
||||
<option value="$PROJECT_DIR$/source" />
|
||||
<option value="$PROJECT_DIR$/utils" />
|
||||
<option value="$PROJECT_DIR$/vcs" />
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveExternalAnnotations" value="false" />
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# 概要
|
||||
<!-- PRの概要 -->
|
||||
|
||||
# 関連Issue
|
||||
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||
|
||||
# 詳細
|
||||
<!-- 詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所 -->
|
||||
|
||||
# チェック
|
||||
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||
- [ ] 機能として完成している
|
||||
- [ ] WIP(Work in progress: 作業中)
|
||||
- [ ] 正常にビルド/起動ができる
|
||||
- [ ] 既存の機能を壊していない
|
||||
@@ -7,6 +7,44 @@ WIP
|
||||
## メモ
|
||||
- アイコン: Google Material Icons https://fonts.google.com/icons (Weight:300, Grade:0, Optical size: 24px)
|
||||
|
||||
## モジュール構成
|
||||
### モジュール一覧
|
||||
- `component` : コンポーネント
|
||||
- `common` : 共通コンポーネント
|
||||
- UIの中で共通で使う要素(メニューアイテムとか)
|
||||
- `scanner` : スキャナー
|
||||
- スキャナーの実装
|
||||
- `viewer` : ビューワー
|
||||
- ドキュメントビューワーの実装
|
||||
- `data` : データ
|
||||
- UIからデータを取得/保存するためのラッパーモジュール
|
||||
- `Document` : ドキュメント関係
|
||||
- WIP(JavaDocを参照してください, 余裕があったら追記します)
|
||||
- `feature` : 機能モジュール(ナビゲーションからみた機能で分割)
|
||||
- `common`: 共通機能
|
||||
- 設定画面とか、どこからでも呼ばれうる画面
|
||||
- `debug`: デバッグメニュー
|
||||
- `home`: ホーム画面
|
||||
- `library`: ライブラリ画面
|
||||
- `scan`: スキャン画面
|
||||
- `search`: 検索画面
|
||||
- `model` : モデル
|
||||
- データモデルをまとめたモジュール (WIP)
|
||||
- `document` : ドキュメント
|
||||
- `meta` : メタデータ
|
||||
- `processor` : プロセッサ
|
||||
- いくつかの処理をまとめたモジュール
|
||||
- `DocumentProcessor` : ドキュメント処理(ドキュメントにページを追加したり更新したり)
|
||||
- `shared` :
|
||||
- 共有リソース
|
||||
- `source` : ソース
|
||||
- (バックエンドが使うのでとりあえず後回し、フロントから直接操作することは絶対にありません)
|
||||
- `utils` : ユーティリティ
|
||||
- ちょっとしたユーティリティをまとめたモジュール
|
||||
- `LacertaLogger` : ロガー
|
||||
- `XmlMetaParser` : XMLメタデータパーサー(フロントから直接操作することは絶対にありません)
|
||||
|
||||
|
||||
## コーディング規則/推奨(WIP)
|
||||
### 規則
|
||||
- `// TODO`コメントには任意のsuffixを付ける
|
||||
|
||||
+9
-26
@@ -59,32 +59,6 @@ dependencies {
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
|
||||
// 内部モジュール
|
||||
// Feature
|
||||
implementation project(':feature:home')
|
||||
implementation project(':feature:search')
|
||||
implementation project(':feature:library')
|
||||
implementation project(':feature:scan')
|
||||
implementation project(':feature:debug') // デバッグメニュー
|
||||
|
||||
// // Component
|
||||
// implementation project(':component:common')
|
||||
// implementation project(':component:scanner')
|
||||
// implementation project(':component:viewer')
|
||||
|
||||
// // Data
|
||||
// implementation project(':data:repository')
|
||||
//
|
||||
// // Source
|
||||
// implementation project(':data:source:database')
|
||||
// implementation project(':data:source:preference')
|
||||
//
|
||||
implementation project(':data')
|
||||
|
||||
implementation project(':shared:ui')
|
||||
|
||||
implementation project(':shared:icon')
|
||||
|
||||
// Hilt (DI)
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
@@ -94,4 +68,13 @@ dependencies {
|
||||
implementation libs.navigation.ui
|
||||
implementation libs.navigation.dynamic.features.fragment
|
||||
|
||||
// Feature
|
||||
implementation project(':feature:home')
|
||||
implementation project(':feature:search')
|
||||
implementation project(':feature:library')
|
||||
implementation project(':feature:scan')
|
||||
implementation project(':feature:debug') // デバッグメニュー
|
||||
|
||||
implementation project(':data')
|
||||
implementation project(':shared:ui')
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package one.nem.lacerta;
|
||||
|
||||
import android.app.Application;
|
||||
import android.util.Log;
|
||||
|
||||
import com.google.android.material.color.DynamicColors;
|
||||
|
||||
@@ -12,7 +13,13 @@ public class LacertaApplication extends Application {
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
// DynamicColorを有効化
|
||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||
if (DynamicColors.isDynamicColorAvailable()) {
|
||||
Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
|
||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||
} else {
|
||||
Log.d("DynamicColors", "DynamicColors is not available.");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,12 +1,15 @@
|
||||
package one.nem.lacerta;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.navigation.NavController;
|
||||
import androidx.navigation.fragment.NavHostFragment;
|
||||
import androidx.navigation.ui.NavigationUI;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||
@@ -25,16 +28,23 @@ public class MainActivity extends AppCompatActivity {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
// Debug
|
||||
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
||||
// Init navigation
|
||||
try {
|
||||
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
||||
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
||||
assert navHostFragment != null;
|
||||
NavController navController = navHostFragment.getNavController();
|
||||
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
||||
}
|
||||
catch (Exception e) {
|
||||
Log.e("Init", "Failed to init navigation");
|
||||
Log.e("Init", "Searchable Error code: " + "894b5941-3bc0-46fe-b752-0dbc88be29a8");
|
||||
Toast.makeText(this, "Failed to init navigation", Toast.LENGTH_LONG).show();
|
||||
finish(); // Exit app
|
||||
}
|
||||
|
||||
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
||||
NavController navController = navHostFragment.getNavController();
|
||||
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
||||
|
||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
||||
|
||||
Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
|
||||
// Set navigation bar color
|
||||
getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurfaceVariant));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -4,17 +4,21 @@
|
||||
<item
|
||||
android:id="@id/feature_home_navigation"
|
||||
android:icon="@drawable/home_24px"
|
||||
android:title="Home"/>
|
||||
android:title="@string/home_title"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_search_navigation"
|
||||
android:icon="@drawable/search_24px"
|
||||
android:title="@string/search_title"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_library_navigation"
|
||||
android:icon="@drawable/folder_24px"
|
||||
android:title="Library"/>
|
||||
android:title="@string/library_title"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_debug_navigation"
|
||||
android:icon="@drawable/developer_mode_24px"
|
||||
android:title="Debug menu"/>
|
||||
|
||||
android:title="@string/debug_menu_title"/>
|
||||
|
||||
</menu>
|
||||
@@ -9,6 +9,7 @@
|
||||
<include app:graph="@navigation/feature_library_navigation" />
|
||||
|
||||
<include app:graph="@navigation/feature_home_navigation" />
|
||||
<include app:graph="@navigation/feature_search_navigation" />
|
||||
|
||||
|
||||
</navigation>
|
||||
@@ -1,5 +1,6 @@
|
||||
plugins {
|
||||
alias(libs.plugins.com.android.library)
|
||||
id 'com.google.dagger.hilt.android'
|
||||
}
|
||||
|
||||
android {
|
||||
@@ -29,12 +30,26 @@ dependencies {
|
||||
|
||||
implementation libs.androidx.appcompat
|
||||
implementation libs.com.google.android.material
|
||||
implementation libs.androidx.activity
|
||||
implementation libs.androidx.constraintlayout
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
|
||||
// Hilt (DI)
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
|
||||
implementation 'com.websitebeaver:documentscanner:1.0.0'
|
||||
|
||||
implementation project(':shared:ui')
|
||||
implementation project(':model')
|
||||
|
||||
implementation project(':processor')
|
||||
|
||||
implementation project(':utils')
|
||||
|
||||
implementation project(':vcs')
|
||||
|
||||
implementation project(':data')
|
||||
}
|
||||
@@ -1,4 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<application>
|
||||
<activity
|
||||
android:name=".ScannerManagerActivity"
|
||||
android:exported="false" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
+134
-27
@@ -25,15 +25,32 @@ import android.widget.Toast;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||
import one.nem.lacerta.processor.DocumentProcessor;
|
||||
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
||||
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link ScannerDataManagerStubFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class ScannerDataManagerStubFragment extends Fragment {
|
||||
|
||||
// TODO-rca: 時間があったらcacheを使うようにする?
|
||||
@@ -43,6 +60,19 @@ public class ScannerDataManagerStubFragment extends Fragment {
|
||||
|
||||
private Uri photoURI;
|
||||
|
||||
private DocumentDetail documentDetail;
|
||||
|
||||
private DocumentProcessor documentProcessor;
|
||||
|
||||
@Inject
|
||||
DocumentProcessorFactory documentProcessorFactory;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
DeviceInfoUtils deviceInfoUtils;
|
||||
|
||||
private final ActivityResultLauncher<Intent> cameraLauncher = registerForActivityResult(
|
||||
new ActivityResultContracts.StartActivityForResult(),
|
||||
result -> {
|
||||
@@ -93,33 +123,110 @@ public class ScannerDataManagerStubFragment extends Fragment {
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
|
||||
Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
|
||||
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||
if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
|
||||
File photoFile = null;
|
||||
try {
|
||||
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
|
||||
String imageFileName = "JPEG_" + timeStamp + "_";
|
||||
File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
|
||||
photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
|
||||
} catch (IOException ex) {
|
||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
|
||||
}
|
||||
if (photoFile != null) {
|
||||
photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
|
||||
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
|
||||
cameraLauncher.launch(takePictureIntent);
|
||||
}
|
||||
else {
|
||||
Log.d("ScannerDataManagerStubFragment", "photoFile is null");
|
||||
}
|
||||
}
|
||||
else {
|
||||
Log.d("ScannerDataManagerStubFragment", "camera not available");
|
||||
}
|
||||
updateResults();
|
||||
});
|
||||
// view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
|
||||
// Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||
// if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
|
||||
// File photoFile = null;
|
||||
// try {
|
||||
// String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
|
||||
// String imageFileName = "JPEG_" + timeStamp + "_";
|
||||
// File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
|
||||
// photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
|
||||
// } catch (IOException ex) {
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
|
||||
// }
|
||||
// if (photoFile != null) {
|
||||
// photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
|
||||
// takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
|
||||
// cameraLauncher.launch(takePictureIntent);
|
||||
// }
|
||||
// else {
|
||||
// Log.d("ScannerDataManagerStubFragment", "photoFile is null");
|
||||
// }
|
||||
// }
|
||||
// else {
|
||||
// Log.d("ScannerDataManagerStubFragment", "camera not available");
|
||||
// }
|
||||
// updateResults();
|
||||
// });
|
||||
//
|
||||
// view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
|
||||
// Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
|
||||
//
|
||||
// this.documentDetail = createSampleDocumentDetail();
|
||||
//
|
||||
// });
|
||||
//
|
||||
// view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
|
||||
// Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
|
||||
// // TODO-rca: ここでDocumentProcessorを初期化する
|
||||
// if (this.documentDetail == null) {
|
||||
// Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
|
||||
// return;
|
||||
// }
|
||||
// this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
|
||||
// Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
|
||||
// try {
|
||||
// this.documentProcessor.init();
|
||||
// } catch (Exception e) {
|
||||
// Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
|
||||
// }
|
||||
// Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
|
||||
// });
|
||||
//
|
||||
// view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
|
||||
// Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
|
||||
// if (this.documentProcessor == null) {
|
||||
// Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
|
||||
// return;
|
||||
// }
|
||||
// Bitmap[] bitmaps = new Bitmap[results.size()];
|
||||
// for (int i = 0; i < results.size(); i++) {
|
||||
// bitmaps[i] = results.get(i).getBitmap();
|
||||
// }
|
||||
//
|
||||
// try {
|
||||
// this.documentProcessor.addNewPagesToLast(bitmaps);
|
||||
// } catch (Exception e) {
|
||||
// Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
|
||||
// }
|
||||
//
|
||||
// Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
|
||||
//
|
||||
// try {
|
||||
// this.documentProcessor.close();
|
||||
// } catch (Exception e) {
|
||||
// Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
|
||||
// }
|
||||
// });
|
||||
}
|
||||
|
||||
public DocumentDetail createSampleDocumentDetail() {
|
||||
//
|
||||
// String id = UUID.randomUUID().toString();
|
||||
//
|
||||
// Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
|
||||
// //logger.debug("CreateSample", "Generated id: " + id);
|
||||
//
|
||||
// DocumentMeta meta = new DocumentMeta(
|
||||
// id,
|
||||
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
|
||||
// new Date(),
|
||||
// new Date());
|
||||
//
|
||||
// DocumentPath path = new DocumentPath(
|
||||
// deviceInfoUtils.getExternalStorageDirectoryString(),
|
||||
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
|
||||
//
|
||||
// return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+204
@@ -0,0 +1,204 @@
|
||||
package one.nem.lacerta.component.scanner;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.EdgeToEdge;
|
||||
import androidx.annotation.AnimatorRes;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.graphics.Insets;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import androidx.core.view.WindowInsetsCompat;
|
||||
|
||||
import com.google.android.material.appbar.MaterialToolbar;
|
||||
import com.websitebeaver.documentscanner.DocumentScanner;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Objects;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.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
|
||||
public class ScannerManagerActivity extends AppCompatActivity {
|
||||
|
||||
String TAG = "ScannerManagerActivity";
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
Document document;
|
||||
|
||||
@Inject
|
||||
DocumentProcessorFactory documentProcessorFactory;
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
// Variables
|
||||
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||
|
||||
View view;
|
||||
|
||||
DocumentScanner documentScanner = new DocumentScanner(
|
||||
this,
|
||||
(croppedImageResults) -> {
|
||||
logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
|
||||
ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||
for (String result : croppedImageResults) {
|
||||
croppedImages.add(BitmapFactory.decodeFile(result));
|
||||
}
|
||||
processResult(croppedImages);
|
||||
return null;
|
||||
},
|
||||
(errorMessage) -> {
|
||||
// an error happened
|
||||
logger.error(TAG, "Error: " + errorMessage);
|
||||
logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
|
||||
return null;
|
||||
},
|
||||
() -> {
|
||||
// user canceled document scan
|
||||
logger.debug(TAG, "User canceled document scan");
|
||||
return null;
|
||||
},
|
||||
null,
|
||||
null,
|
||||
null
|
||||
);
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
EdgeToEdge.enable(this);
|
||||
setContentView(R.layout.activity_scanner_manager);
|
||||
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
||||
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
|
||||
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
|
||||
return insets;
|
||||
});
|
||||
|
||||
MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
|
||||
setSupportActionBar(toolbar);
|
||||
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
||||
|
||||
documentScanner.startScan();
|
||||
// Init
|
||||
|
||||
this.view = findViewById(R.id.main); // TODO-rca:なんとかする
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(android.view.Menu menu) {
|
||||
getMenuInflater().inflate(R.menu.scanner_result_toolbar, menu);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(android.view.MenuItem item) {
|
||||
if (item.getItemId() == R.id.action_save_new) {
|
||||
// 新ドキュメントとして保存
|
||||
Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
|
||||
saveNewDocument();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_insert_exist) {
|
||||
// 既存ドキュメントに挿入
|
||||
Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
|
||||
insertToExistDocument();
|
||||
return true;
|
||||
} else if (item.getItemId() == android.R.id.home) {
|
||||
finish();
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
private void processResult(ArrayList<Bitmap> resultImages) {
|
||||
logger.debug(TAG, "processResult");
|
||||
|
||||
if (resultImages.isEmpty()) {
|
||||
logger.debug(TAG, "resultImages(arg) is empty");
|
||||
if (this.croppedImages.isEmpty()) {
|
||||
logger.debug(TAG, "this.resultImages is empty");
|
||||
logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
|
||||
// TODO-rca: なんかする
|
||||
} else {
|
||||
logger.debug(TAG, "this.resultImages is not empty");
|
||||
updateResultView(this.croppedImages);
|
||||
}
|
||||
} else {
|
||||
logger.debug(TAG, "resultImages(arg) is not empty");
|
||||
updateResultView(resultImages);
|
||||
this.croppedImages = resultImages;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void saveNewDocument() {
|
||||
logger.debug(TAG, "saveNewDocument");
|
||||
DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
|
||||
DocumentDetail documentDetail = document.createDocument(documentMeta);
|
||||
Bitmap[] bitmaps = new Bitmap[this.croppedImages.size()];
|
||||
this.croppedImages.toArray(bitmaps);
|
||||
try {
|
||||
documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps);
|
||||
Toast.makeText(this, "Saved.", Toast.LENGTH_SHORT).show();
|
||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
|
||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).printLog(); // Debug
|
||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).printRev(); // Debug
|
||||
finish();
|
||||
} catch (Exception e) {
|
||||
logger.error(TAG, "Error: " + e.getMessage());
|
||||
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
||||
}
|
||||
}
|
||||
|
||||
private void insertToExistDocument() {
|
||||
logger.debug(TAG, "insertToExistDocument");
|
||||
// TODO-rca: 実装
|
||||
}
|
||||
|
||||
private void updateResultView(ArrayList<Bitmap> resultImages) {
|
||||
logger.debug(TAG, "updateResultView");
|
||||
|
||||
LinearLayout resultView = findViewById(R.id.result_list_container);
|
||||
ImageView selectedImage = findViewById(R.id.selected_image);
|
||||
resultView.removeAllViews();
|
||||
|
||||
for (Bitmap resultImage : resultImages) {
|
||||
View resultImageView = getLayoutInflater().inflate(R.layout.result_image_container_item, null);
|
||||
ImageView imageView = resultImageView.findViewById(R.id.result_image);
|
||||
imageView.setImageBitmap(resultImage);
|
||||
imageView.setOnClickListener(v -> {
|
||||
|
||||
selectedImage.setImageBitmap(resultImage);
|
||||
|
||||
for (int i = 0; i < resultView.getChildCount(); i++) {
|
||||
View child = resultView.getChildAt(i).findViewById(R.id.result_image);
|
||||
child.setSelected(false);
|
||||
}
|
||||
|
||||
v.setSelected(true);
|
||||
});
|
||||
|
||||
resultView.addView(resultImageView);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+95
@@ -0,0 +1,95 @@
|
||||
package one.nem.lacerta.component.scanner;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.websitebeaver.documentscanner.DocumentScanner;
|
||||
import com.websitebeaver.documentscanner.DocumentScannerActivity;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class ScannerManagerFragment extends Fragment {
|
||||
|
||||
String TAG = getClass().getSimpleName();
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory vcsFactory;
|
||||
|
||||
private static final boolean DEFAULT_SINGLE_PAGE = false;
|
||||
private boolean singlePage;
|
||||
|
||||
public ScannerManagerFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
// public static ScannerManagerFragment newInstance(boolean singlePage) {
|
||||
// ScannerManagerFragment fragment = new ScannerManagerFragment();
|
||||
// Bundle args = new Bundle();
|
||||
// args.putBoolean("singlePage", singlePage);
|
||||
// fragment.setArguments(args);
|
||||
// return fragment;
|
||||
// }
|
||||
|
||||
public static ScannerManagerFragment newInstance() {
|
||||
ScannerManagerFragment fragment = new ScannerManagerFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putBoolean("singlePage", DEFAULT_SINGLE_PAGE);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
singlePage = getArguments().getBoolean("singlePage", DEFAULT_SINGLE_PAGE);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_scanner_manager, container, false);
|
||||
|
||||
// ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
|
||||
// ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
// ViewGroup.LayoutParams.MATCH_PARENT
|
||||
// );
|
||||
// view.setLayoutParams(layoutParams);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
// Init
|
||||
logger.debug(TAG, "called");
|
||||
|
||||
view.findViewById(R.id.button_intent_scanner_manager_activity).setOnClickListener(v -> {
|
||||
// DocumentScannerActivityを起動する
|
||||
Intent intent = new Intent(requireActivity().getApplicationContext(), ScannerManagerActivity.class);
|
||||
startActivity(intent);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_selected="true">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#00000000" />
|
||||
<corners android:radius="8dp" />
|
||||
<stroke android:color="#FF0000" android:width="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#00000000" />
|
||||
<corners android:radius="8dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
@@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/main"
|
||||
android:theme="@style/Theme.Lacerta"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<com.google.android.material.appbar.MaterialToolbar
|
||||
android:id="@+id/top_toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/colorPrimaryContainer"
|
||||
app:titleTextColor="@color/colorOnPrimaryContainer"
|
||||
app:title="Preview"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
android:theme="?attr/actionBarTheme"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/selected_image"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_above="@+id/horizontal_scroll"
|
||||
android:scaleType="centerInside"
|
||||
app:layout_constraintBottom_toTopOf="@+id/horizontal_scroll"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/top_toolbar" />
|
||||
|
||||
<HorizontalScrollView
|
||||
android:id="@+id/horizontal_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:scrollbars="none"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/selected_image">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/result_list_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</HorizontalScrollView>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -11,6 +11,7 @@
|
||||
android:id="@+id/action_button_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:weightSum="2"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -19,7 +20,7 @@
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_call_camera"
|
||||
style="@style/Widget.Material3.Button.IconButton.Filled"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16px"
|
||||
android:layout_weight="1"
|
||||
@@ -27,6 +28,58 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/init_button_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/action_button_container">
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_create_documnent"
|
||||
style="@style/Widget.Material3.Button.IconButton.Filled"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16px"
|
||||
android:layout_weight="1"
|
||||
android:text="Create Doc Obj" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_init_document_processor"
|
||||
style="@style/Widget.Material3.Button.IconButton.Filled"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16px"
|
||||
android:layout_weight="1"
|
||||
android:text="Init Processor" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/doc_button_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:weightSum="2"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/init_button_container">
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_add_page"
|
||||
style="@style/Widget.Material3.Button.IconButton.Filled"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16px"
|
||||
android:layout_weight="1"
|
||||
android:text="Add page to last" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/result_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
@@ -35,6 +88,6 @@
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/action_button_container" />
|
||||
app:layout_constraintTop_toBottomOf="@id/doc_button_container" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ScannerManagerFragment">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_intent_scanner_manager_activity"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/result_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxHeight="64dp"
|
||||
android:adjustViewBounds="true"
|
||||
android:background="@drawable/result_image_container_item_border"
|
||||
android:padding="8dp"
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
</FrameLayout>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item
|
||||
android:id="@+id/action_save_new"
|
||||
android:icon="@drawable/save_24px"
|
||||
android:title="Save"
|
||||
app:showAsAction="ifRoom"/>
|
||||
<item
|
||||
android:id="@+id/action_insert_exist"
|
||||
android:icon="@drawable/ic_baseline_add_24"
|
||||
android:title="Save"
|
||||
app:showAsAction="ifRoom"/>
|
||||
</menu>
|
||||
@@ -41,6 +41,9 @@ dependencies {
|
||||
// JGit
|
||||
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
|
||||
|
||||
// Java Faker
|
||||
implementation 'com.github.javafaker:javafaker:1.0.2'
|
||||
|
||||
// Room
|
||||
implementation libs.androidx.room.runtime
|
||||
annotationProcessor libs.androidx.room.compiler
|
||||
@@ -53,4 +56,6 @@ dependencies {
|
||||
|
||||
// データソースモジュール
|
||||
implementation project(':source')
|
||||
|
||||
implementation project(':vcs')
|
||||
}
|
||||
@@ -13,34 +13,13 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
*/
|
||||
public interface Document {
|
||||
|
||||
ArrayList<DocumentMeta> getAllDocumentMetas(int limit);
|
||||
DocumentDetail createDocument(DocumentMeta meta);
|
||||
|
||||
ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset);
|
||||
DocumentDetail createDocument();
|
||||
|
||||
/**
|
||||
* 更新の新しいドキュメントから順に並べてlimit件取得する
|
||||
* @param limit 取得する上限数
|
||||
*/
|
||||
ArrayList<DocumentMeta> getRecentDocumentMetas(int limit);
|
||||
void deleteDocument(String documentId);
|
||||
|
||||
/**
|
||||
* 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する
|
||||
* @param limit 取得する上限数
|
||||
* @param offset 取得するオフセット
|
||||
*/
|
||||
ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset);
|
||||
void updateDocument(DocumentMeta meta, DocumentDetail detail);
|
||||
|
||||
/**
|
||||
* ドキュメントIDからDocumentDetailを取得する
|
||||
* @param id ドキュメントID
|
||||
*/
|
||||
DocumentDetail getDocumentDetail(String id);
|
||||
|
||||
/**
|
||||
* DocumentMetaからDocumentDetailを取得する
|
||||
* @param meta DocumentMeta
|
||||
*/
|
||||
DocumentDetail getDocumentDetailByMeta(DocumentMeta meta); // 簡単に使えるように
|
||||
|
||||
DocumentDetail createDocumentByMeta(DocumentMeta meta);
|
||||
DocumentDetail getDocument(String documentId);
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package one.nem.lacerta.data;
|
||||
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
|
||||
public interface DocumentDebug {
|
||||
|
||||
void insertDocument(DocumentMeta meta, DocumentDetail detail);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package one.nem.lacerta.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
|
||||
public interface LacertaLibrary {
|
||||
|
||||
// Get History
|
||||
ArrayList<ListItem> getRecentDocument(int limit);
|
||||
ArrayList<ListItem> getRecentDocument(int limit, int offset);
|
||||
|
||||
// Get Library page
|
||||
LibraryItemPage getLibraryPage(int limit);
|
||||
LibraryItemPage getLibraryPage(int limit, int offset);
|
||||
LibraryItemPage getLibraryPage(String pageId, int limit);
|
||||
LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
|
||||
|
||||
// GetDocument
|
||||
DocumentDetail getDocumentDetailById(String id); // TODO-rca: Documentに統合する
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package one.nem.lacerta.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
|
||||
public interface LacertaSearch {
|
||||
|
||||
ArrayList<ListItem> autoSearch(String query, int limit);
|
||||
|
||||
ArrayList<ListItem> autoSearch(String query, int limit, int offset);
|
||||
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
package one.nem.lacerta.data.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import one.nem.lacerta.data.DocumentDebug;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
|
||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||
import one.nem.lacerta.source.database.entity.LibraryEntity;
|
||||
import one.nem.lacerta.source.database.entity.TagEntity;
|
||||
|
||||
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||
|
||||
public class DocumentDebugImpl implements DocumentDebug{
|
||||
|
||||
@Inject
|
||||
LacertaDatabase database;
|
||||
|
||||
@Inject
|
||||
public DocumentDebugImpl() {
|
||||
}
|
||||
|
||||
|
||||
public void insertDocument(DocumentMeta meta, DocumentDetail detail) {
|
||||
DocumentEntity documentEntity = new DocumentEntity();
|
||||
LibraryEntity libraryEntity = new LibraryEntity();
|
||||
|
||||
documentEntity.id = meta.getId();
|
||||
documentEntity.title = meta.getTitle();
|
||||
documentEntity.createdAt = meta.getCreatedAt();
|
||||
documentEntity.updatedAt = meta.getUpdatedAt();
|
||||
documentEntity.author = detail.getAuthor();
|
||||
documentEntity.defaultBranch = detail.getDefaultBranch();
|
||||
// ArrayListからListに変換
|
||||
documentEntity.tagIds = meta.getTagIds();
|
||||
|
||||
libraryEntity.id = meta.getId();
|
||||
libraryEntity.path = "Placeholder";
|
||||
libraryEntity.rootPath = "Placeholder";
|
||||
|
||||
database.documentDao().insert(documentEntity);
|
||||
database.libraryDao().insert(libraryEntity);
|
||||
}
|
||||
}
|
||||
@@ -1,141 +1,107 @@
|
||||
package one.nem.lacerta.data.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
|
||||
// Hilt
|
||||
import javax.inject.Inject;
|
||||
|
||||
// Lacerta/data
|
||||
import one.nem.lacerta.data.Document;
|
||||
|
||||
// Lacerta/model
|
||||
import one.nem.lacerta.model.PublicPath;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
|
||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
// Lacerta/source
|
||||
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||
|
||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||
import one.nem.lacerta.source.database.entity.LibraryEntity;
|
||||
import one.nem.lacerta.source.database.entity.TagEntity;
|
||||
|
||||
import one.nem.lacerta.source.jgit.JGitRepository;
|
||||
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
||||
// Lacerta/utils
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
// Lacerta/vcs
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
|
||||
public class DocumentImpl implements Document{
|
||||
public class DocumentImpl implements Document {
|
||||
|
||||
private LacertaDatabase database;
|
||||
String TAG = getClass().getSimpleName();
|
||||
|
||||
@Inject
|
||||
public DocumentImpl(LacertaDatabase database) {
|
||||
this.database = database;
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaDatabase database;
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory vcsFactory;
|
||||
|
||||
|
||||
@Inject
|
||||
public DocumentImpl() {
|
||||
// Init
|
||||
// logger.debug(TAG, "called");
|
||||
}
|
||||
|
||||
@Inject
|
||||
JGitRepository jGitRepository;
|
||||
|
||||
@Inject
|
||||
DeviceInfoUtils deviceInfoUtils;
|
||||
|
||||
@Override
|
||||
public ArrayList<DocumentMeta> getAllDocumentMetas(int limit) {
|
||||
ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
|
||||
List<DocumentEntity> documentEntities = database.documentDao().getAllWithLimit(limit);
|
||||
public DocumentDetail createDocument(DocumentMeta meta) {
|
||||
DocumentDetail detail = new DocumentDetail();
|
||||
detail.setMeta(meta);
|
||||
detail.setPages(new ArrayList<>());
|
||||
|
||||
for (DocumentEntity documentEntity : documentEntities) {
|
||||
// タグ取得
|
||||
// TODO-rca: 切り出すべきかも?
|
||||
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
|
||||
ArrayList<DocumentTag> documentTags = new ArrayList<>();
|
||||
for (TagEntity tagEntity : tagEntities) {
|
||||
documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
|
||||
}
|
||||
// TODO-rca: UIスレッドから追い出す
|
||||
|
||||
// 組み立て処理
|
||||
// 可読性が終わるのでコンストラクタはつかわないほうがいいかも?
|
||||
DocumentMeta documentMeta = new DocumentMeta();
|
||||
documentMeta.setId(documentEntity.id);
|
||||
documentMeta.setTitle(documentEntity.title);
|
||||
documentMeta.setCreatedAt(documentEntity.createdAt);
|
||||
documentMeta.setUpdatedAt(documentEntity.updatedAt);
|
||||
documentMeta.setTags(documentTags);
|
||||
// Create DocumentEntity
|
||||
DocumentEntity documentEntity = new DocumentEntity();
|
||||
documentEntity.id = meta.getId();
|
||||
documentEntity.title = meta.getTitle();
|
||||
documentEntity.author = meta.getAuthor();
|
||||
documentEntity.defaultBranch = meta.getDefaultBranch();
|
||||
documentEntity.updatedAt = meta.getUpdatedAt();
|
||||
documentEntity.createdAt = meta.getCreatedAt();
|
||||
documentEntity.publicPath = meta.getPath().getStringPath();
|
||||
documentEntity.tagIds = meta.getTagIds();
|
||||
|
||||
documentMetas.add(documentMeta);
|
||||
}
|
||||
database.documentDao().insert(documentEntity);
|
||||
|
||||
return documentMetas;
|
||||
// Vcs
|
||||
LacertaVcs vcs = vcsFactory.create(meta.getId());
|
||||
vcs.createDocument(meta.getId());
|
||||
|
||||
return detail;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset) {
|
||||
return null; // TODO-rca: 実装する
|
||||
public DocumentDetail createDocument() {
|
||||
DocumentMeta meta = new DocumentMeta();
|
||||
meta.setId(UUID.randomUUID().toString());
|
||||
meta.setTitle("New Document");
|
||||
meta.setAuthor("author");
|
||||
meta.setDefaultBranch("master");
|
||||
meta.setUpdatedAt(new Date());
|
||||
meta.setCreatedAt(new Date());
|
||||
meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
|
||||
meta.setTags(new ArrayList<>());
|
||||
return createDocument(meta);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit) {
|
||||
// ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
|
||||
// database.documentDao().
|
||||
// TODO-rca: 履歴取得するDao実装する
|
||||
public void deleteDocument(String documentId) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDocument(DocumentMeta meta, DocumentDetail detail) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public DocumentDetail getDocument(String documentId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DocumentDetail getDocumentDetail(String id) {
|
||||
DocumentDetail documentDetail = new DocumentDetail();
|
||||
DocumentEntity documentEntity = database.documentDao().findById(id);
|
||||
|
||||
// タグ取得
|
||||
// TODO-rca: 切り出すべきかも?
|
||||
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
|
||||
ArrayList<DocumentTag> documentTags = new ArrayList<>();
|
||||
for (TagEntity tagEntity : tagEntities) {
|
||||
documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
|
||||
}
|
||||
|
||||
// パス取得
|
||||
// TODO-rca: 切り出すべきかも?
|
||||
LibraryEntity libraryEntity = database.libraryDao().findById(id);
|
||||
DocumentPath documentPath = new DocumentPath(libraryEntity.rootPath, libraryEntity.path);
|
||||
|
||||
// リポジトリ取得
|
||||
documentDetail.setRepository(jGitRepository.getRepository(id)); // TODO-rca: エラーハンドリング
|
||||
|
||||
// 組み立て処理
|
||||
// 可読性が終わるのでコンストラクタはつかわないほうがいいかも?
|
||||
DocumentMeta documentMeta = new DocumentMeta();
|
||||
documentMeta.setId(documentEntity.id);
|
||||
documentMeta.setTitle(documentEntity.title);
|
||||
documentMeta.setCreatedAt(documentEntity.createdAt);
|
||||
documentMeta.setUpdatedAt(documentEntity.updatedAt);
|
||||
documentMeta.setTags(documentTags);
|
||||
|
||||
documentDetail.setMeta(documentMeta);
|
||||
documentDetail.setAuthor(documentEntity.author);
|
||||
documentDetail.setPath(documentPath);
|
||||
documentDetail.setDefaultBranch(documentEntity.defaultBranch);
|
||||
|
||||
return documentDetail;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DocumentDetail getDocumentDetailByMeta(DocumentMeta meta) {
|
||||
return getDocumentDetail(meta.getId()); // TODO-rca: 効率悪いのでMetaはもらった物を使うようにする(処理を切り分ける?)
|
||||
}
|
||||
|
||||
@Override
|
||||
public DocumentDetail createDocumentByMeta(DocumentMeta meta) {
|
||||
DocumentDetail documentDetail = new DocumentDetail();
|
||||
|
||||
documentDetail.setMeta(meta);
|
||||
documentDetail.setAuthor("author"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする or Gitの設定を参照するようにする
|
||||
documentDetail.setPath(new DocumentPath(deviceInfoUtils.getExternalStorageDirectoryString(), meta.getId()));
|
||||
documentDetail.setDefaultBranch("master"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする?
|
||||
|
||||
return documentDetail;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
package one.nem.lacerta.data.impl;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
public class LacertaLibraryImpl implements LacertaLibrary {
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaDatabase database;
|
||||
|
||||
@Override
|
||||
public ArrayList<ListItem> getRecentDocument(int limit) {
|
||||
List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
|
||||
|
||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||
for (DocumentEntity documentEntity : documentEntities) {
|
||||
ListItem listItem = new ListItem();
|
||||
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
||||
listItem.setTitle(documentEntity.title);
|
||||
listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
|
||||
listItem.setItemId(documentEntity.id);
|
||||
listItems.add(listItem);
|
||||
}
|
||||
return listItems;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
|
||||
return null; // TODO-rca: Implement
|
||||
}
|
||||
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(int limit) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(int limit, int offset) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(String pageId, int limit) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DocumentDetail getDocumentDetailById(String id) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,219 @@
|
||||
package one.nem.lacerta.data.impl;
|
||||
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
import com.github.javafaker.DateAndTime;
|
||||
import com.github.javafaker.Faker;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/**
|
||||
* LacertaLibraryのスタブ実装
|
||||
*/
|
||||
public class LacertaLibraryStubImpl implements LacertaLibrary {
|
||||
|
||||
LacertaLogger logger;
|
||||
|
||||
Faker faker;
|
||||
|
||||
@Inject
|
||||
public LacertaLibraryStubImpl(LacertaLogger logger) {
|
||||
faker = new Faker(); // Init Faker
|
||||
this.logger = logger;
|
||||
logger.debug("LibraryStub", "Initialized");
|
||||
}
|
||||
|
||||
// Internal Methods
|
||||
|
||||
// Generate Stub Data
|
||||
private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) {
|
||||
logger.debug("LibraryStub", "generateStubLibraryItemPage");
|
||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||
int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定
|
||||
int folderTotal;
|
||||
// フォルダ数の抽選
|
||||
if (itemTotal > 4) {
|
||||
folderTotal = faker.number().numberBetween(1, itemTotal - 2);
|
||||
}
|
||||
else {
|
||||
if (itemTotal > 2) {
|
||||
folderTotal = 1;
|
||||
}
|
||||
else { // ドキュメント数がゼロにならないように
|
||||
folderTotal = 0;
|
||||
}
|
||||
}
|
||||
int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定
|
||||
logger.debug("LibraryStub", "itemTotal: " + itemTotal);
|
||||
logger.debug("LibraryStub", "folderTotal: " + folderTotal);
|
||||
logger.debug("LibraryStub", "documentTotal: " + documentTotal);
|
||||
|
||||
// フォルダを生成
|
||||
for (int i = 0; i < folderTotal; i++) {
|
||||
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER));
|
||||
}
|
||||
// ドキュメントを生成
|
||||
for (int i = 0; i < documentTotal; i++) {
|
||||
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
|
||||
}
|
||||
|
||||
LibraryItemPage libraryItemPage = new LibraryItemPage();
|
||||
libraryItemPage.setListItems(listItems);
|
||||
if (pageId == null) {
|
||||
libraryItemPage.setPageId(UUID.randomUUID().toString());
|
||||
} else {
|
||||
libraryItemPage.setPageId(pageId);
|
||||
}
|
||||
libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3));
|
||||
|
||||
return libraryItemPage;
|
||||
}
|
||||
|
||||
private ListItem generateStubListItem(ListItemType itemType) {
|
||||
if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
|
||||
ListItem listItem = new ListItem();
|
||||
listItem.setTitle("FakeFolder" + faker.number().digits(3));
|
||||
listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
|
||||
listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
|
||||
listItem.setItemId(UUID.randomUUID().toString());
|
||||
return listItem;
|
||||
} else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
|
||||
ListItem listItem = new ListItem();
|
||||
listItem.setTitle("FakeDocument" + faker.book().title());
|
||||
listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
|
||||
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
||||
listItem.setItemId(UUID.randomUUID().toString());
|
||||
return listItem;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private LibraryItemPage getRecentDocumentPage(int limit) {
|
||||
int itemTotal = faker.number().numberBetween(1, limit);
|
||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||
for (int i = 0; i < itemTotal; i++) {
|
||||
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
|
||||
}
|
||||
// DescriptionからDateを抽出して新しい順にソート
|
||||
listItems.sort((a, b) -> {
|
||||
String aDate = a.getDescription().substring(11);
|
||||
String bDate = b.getDescription().substring(11);
|
||||
return bDate.compareTo(aDate);
|
||||
});
|
||||
LibraryItemPage libraryItemPage = new LibraryItemPage();
|
||||
libraryItemPage.setListItems(listItems);
|
||||
libraryItemPage.setPageId(UUID.randomUUID().toString());
|
||||
libraryItemPage.setPageTitle("RecentDocument");
|
||||
return libraryItemPage;
|
||||
}
|
||||
|
||||
private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException {
|
||||
|
||||
if (Objects.isNull(id)) {
|
||||
throw new IllegalArgumentException("id is null");
|
||||
}
|
||||
|
||||
DocumentMeta documentMeta = new DocumentMeta();
|
||||
documentMeta.setId(id);
|
||||
documentMeta.setTitle("FakeDocument" + faker.book().title());
|
||||
documentMeta.setCreatedAt(faker.date().birthday());
|
||||
documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする?
|
||||
ArrayList<String> tagIds = new ArrayList<>();
|
||||
|
||||
DocumentDetail documentDetail = new DocumentDetail();
|
||||
documentDetail.setMeta(documentMeta);
|
||||
// documentDetail.setPath(null); // TODO-rca: なんとかする
|
||||
// documentDetail.setAuthor(faker.name().fullName());
|
||||
// documentDetail.setRepository(null); // TODO-rca: なんとかする
|
||||
return documentDetail;
|
||||
}
|
||||
|
||||
/**
|
||||
* 履歴ページを取得する
|
||||
* @param limit 取得するアイテム数
|
||||
* @return ページオブジェクト
|
||||
*/
|
||||
@Override
|
||||
public ArrayList<ListItem> getRecentDocument(int limit) {
|
||||
return getRecentDocumentPage(limit).getListItems();
|
||||
}
|
||||
|
||||
/**
|
||||
* 履歴ページを取得する
|
||||
* @param limit 取得するアイテム数
|
||||
* @param offset 取得するアイテムのオフセット
|
||||
* @return ページオブジェクト
|
||||
*/
|
||||
@Override
|
||||
public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
|
||||
return getRecentDocumentPage(limit).getListItems();
|
||||
}
|
||||
|
||||
/**
|
||||
* ライブラリページを取得する
|
||||
* @param limit 取得するアイテム数
|
||||
* @return ページオブジェクト
|
||||
*/
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(int limit) {
|
||||
return generateStubLibraryItemPage(limit, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* ライブラリページを取得する
|
||||
* @param limit 取得するアイテム数
|
||||
* @param offset 取得するアイテムのオフセット
|
||||
* @return ページオブジェクト
|
||||
*/
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(int limit, int offset) {
|
||||
return generateStubLibraryItemPage(limit, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* ライブラリページを取得する
|
||||
* @param pageId ページID
|
||||
* @param limit 取得するアイテム数
|
||||
* @return ページオブジェクト
|
||||
*/
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(String pageId, int limit) {
|
||||
return generateStubLibraryItemPage(limit, pageId);
|
||||
}
|
||||
|
||||
/**
|
||||
* ライブラリページを取得する
|
||||
* @param pageId ページID
|
||||
* @param limit 取得するアイテム数
|
||||
* @param offset 取得するアイテムのオフセット
|
||||
* @return ページオブジェクト
|
||||
*/
|
||||
@Override
|
||||
public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
|
||||
return generateStubLibraryItemPage(limit, pageId);
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメント詳細を取得する
|
||||
* @param id ドキュメントID
|
||||
* @return ドキュメント詳細オブジェクト
|
||||
*/
|
||||
@Override
|
||||
public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException {
|
||||
return generateStubDocumentDetail(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package one.nem.lacerta.data.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import one.nem.lacerta.data.LacertaSearch;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
public class LacertaSearchStubImpl implements LacertaSearch {
|
||||
|
||||
private LacertaLibrary library;
|
||||
private LacertaLogger logger;
|
||||
|
||||
|
||||
@Inject
|
||||
public LacertaSearchStubImpl(LacertaLibrary library, LacertaLogger logger) {
|
||||
this.library = library;
|
||||
this.logger = logger;
|
||||
}
|
||||
|
||||
/**
|
||||
* 検索
|
||||
* @param query 検索クエリ
|
||||
* @param limit 最大取得件数
|
||||
* @return 検索結果
|
||||
*/
|
||||
@Override
|
||||
public ArrayList<ListItem> autoSearch(String query, int limit) {
|
||||
logger.debug("SearchStub", "autoSearch");
|
||||
logger.debug("SearchStub", "query: " + query);
|
||||
return library.getLibraryPage(limit).getListItems();
|
||||
}
|
||||
|
||||
/**
|
||||
* 検索
|
||||
* @param query 検索クエリ
|
||||
* @param limit 最大取得件数
|
||||
* @param offset オフセット
|
||||
* @return 検索結果
|
||||
*/
|
||||
@Override
|
||||
public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
|
||||
logger.debug("SearchStub", "autoSearch");
|
||||
logger.debug("SearchStub", "query: " + query);
|
||||
return library.getLibraryPage(limit, offset).getListItems();
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package one.nem.lacerta.data.module;
|
||||
|
||||
import dagger.Binds;
|
||||
import dagger.Module;
|
||||
import dagger.hilt.InstallIn;
|
||||
import dagger.hilt.components.SingletonComponent;
|
||||
import one.nem.lacerta.data.DocumentDebug;
|
||||
import one.nem.lacerta.data.impl.DocumentDebugImpl;
|
||||
|
||||
@Module
|
||||
@InstallIn(SingletonComponent.class) // TODO-rca: Singletonでいいのか検討する
|
||||
abstract public class DocumentDebugModule {
|
||||
|
||||
@Binds
|
||||
public abstract DocumentDebug bindDocumentDebug(DocumentDebugImpl documentDebugImpl);
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package one.nem.lacerta.data.module;
|
||||
|
||||
import dagger.Binds;
|
||||
import dagger.Module;
|
||||
import dagger.hilt.InstallIn;
|
||||
import dagger.hilt.android.components.FragmentComponent;
|
||||
import dagger.hilt.migration.DisableInstallInCheck;
|
||||
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.data.impl.LacertaLibraryStubImpl;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
@Module
|
||||
// Fragmentにinstall
|
||||
@InstallIn(FragmentComponent.class)
|
||||
abstract public class LacertaLibraryModule {
|
||||
|
||||
@Binds
|
||||
public abstract LacertaLibrary bindLacertaLibrary(LacertaLibraryStubImpl impl);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package one.nem.lacerta.data.module;
|
||||
|
||||
import dagger.Binds;
|
||||
import dagger.Module;
|
||||
import dagger.hilt.InstallIn;
|
||||
import dagger.hilt.android.components.FragmentComponent;
|
||||
import one.nem.lacerta.data.LacertaSearch;
|
||||
import one.nem.lacerta.data.impl.LacertaSearchStubImpl;
|
||||
|
||||
@Module
|
||||
@InstallIn(FragmentComponent.class)
|
||||
abstract public class LacertaSearchModule {
|
||||
|
||||
@Binds
|
||||
public abstract LacertaSearch bindLacertaSearch(LacertaSearchStubImpl impl);
|
||||
}
|
||||
@@ -65,4 +65,10 @@ dependencies {
|
||||
// Scanner
|
||||
implementation project(':component:scanner')
|
||||
|
||||
// Processor
|
||||
implementation project(':processor')
|
||||
|
||||
// LacertaVcs
|
||||
implementation project(':vcs')
|
||||
|
||||
}
|
||||
@@ -1,10 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<application>
|
||||
<activity
|
||||
android:name=".DebugMenuContainerActivity"
|
||||
android:exported="false" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
package one.nem.lacerta.feature.debug;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuDocProcessorTesterFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class DebugMenuDocProcessorTesterFragment extends Fragment {
|
||||
public DebugMenuDocProcessorTesterFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuDocProcessorTesterFragment newInstance() {
|
||||
DebugMenuDocProcessorTesterFragment fragment = new DebugMenuDocProcessorTesterFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_doc_processor_tester, container, false);
|
||||
|
||||
|
||||
|
||||
return view;
|
||||
}
|
||||
}
|
||||
-81
@@ -1,81 +0,0 @@
|
||||
package one.nem.lacerta.feature.debug;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuDocumentListItemAdapter;
|
||||
import one.nem.lacerta.feature.debug.common.model.DebugMenuDocumentListItem;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuDocumentTesterListFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class DebugMenuDocumentTesterListFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
Document document;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
public DebugMenuDocumentTesterListFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuDocumentTesterListFragment newInstance() {
|
||||
DebugMenuDocumentTesterListFragment fragment = new DebugMenuDocumentTesterListFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_list, container, false);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.recycler_view_document_list);
|
||||
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
|
||||
|
||||
ArrayList<DocumentMeta> documentMetas = document.getAllDocumentMetas(100);
|
||||
|
||||
logger.debug("Debug/DocList", "Document count: " + documentMetas.size());
|
||||
|
||||
List<DebugMenuDocumentListItem> debugMenuDocumentListItems = new ArrayList<>();
|
||||
|
||||
for (DocumentMeta documentMeta : documentMetas) {
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
debugMenuDocumentListItems.add(new DebugMenuDocumentListItem(documentMeta.getTitle(), "Internal Id: " + documentMeta.getId(), simpleDateFormat.format(documentMeta.getUpdatedAt())));
|
||||
}
|
||||
|
||||
DebugMenuDocumentListItemAdapter adapter = new DebugMenuDocumentListItemAdapter(debugMenuDocumentListItems);
|
||||
recyclerView.setAdapter(adapter);
|
||||
|
||||
return view;
|
||||
}
|
||||
}
|
||||
-72
@@ -1,72 +0,0 @@
|
||||
package one.nem.lacerta.feature.debug;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.google.android.material.textfield.TextInputEditText;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import dagger.multibindings.IntKey;
|
||||
import one.nem.lacerta.data.DocumentDebug;
|
||||
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
|
||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuDocumentTesterManageFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class DebugMenuDocumentTesterManageFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
DocumentDebug documentDebug;
|
||||
|
||||
public DebugMenuDocumentTesterManageFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuDocumentTesterManageFragment newInstance() {
|
||||
DebugMenuDocumentTesterManageFragment fragment = new DebugMenuDocumentTesterManageFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_manage, container, false);
|
||||
|
||||
TextInputEditText editTextDocumentTitle = view.findViewById(R.id.edit_text_document_title);
|
||||
view.findViewById(R.id.button_insert_test_data).setOnClickListener( v -> {
|
||||
|
||||
DocumentMeta meta = new DocumentMeta(editTextDocumentTitle != null ? editTextDocumentTitle.getText().toString() : "empty title"); // TODO-rca: Nullable
|
||||
DocumentPath path = new DocumentPath("root", "test_path");
|
||||
DocumentDetail detail = new DocumentDetail(meta, path, "test_author", "test_default_branch");
|
||||
|
||||
documentDebug.insertDocument(meta, detail);
|
||||
});
|
||||
|
||||
return view;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment {
|
||||
|
||||
List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>();
|
||||
|
||||
debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
|
||||
debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
|
||||
// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
|
||||
// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
|
||||
|
||||
|
||||
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems);
|
||||
|
||||
+115
@@ -0,0 +1,115 @@
|
||||
package one.nem.lacerta.feature.debug;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.annotation.AnimatorRes;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuLibraryItemListPageFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class DebugMenuLibraryItemListPageFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
public DebugMenuLibraryItemListPageFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuLibraryItemListPageFragment newInstance() {
|
||||
DebugMenuLibraryItemListPageFragment fragment = new DebugMenuLibraryItemListPageFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
|
||||
|
||||
ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(10);
|
||||
for (ListItem listItem : listItems) {
|
||||
System.out.println(listItem.getTitle());
|
||||
}
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
|
||||
recyclerView.setAdapter(new ItemAdapter(listItems));
|
||||
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
private class ItemAdapter extends RecyclerView.Adapter<ItemAdapter.ItemViewHolder> {
|
||||
private ArrayList<ListItem> listItems;
|
||||
|
||||
public ItemAdapter(ArrayList<ListItem> listItems) {
|
||||
this.listItems = listItems;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_debug_menu_document, parent, false);
|
||||
return new ItemViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(ItemViewHolder holder, int position) {
|
||||
ListItem listItem = listItems.get(position);
|
||||
holder.document_list_item_title.setText(listItem.getTitle());
|
||||
holder.document_list_item_description.setText(listItem.getDescription());
|
||||
holder.document_list_item_updated_at.setText(listItem.getItemType().toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return listItems.size();
|
||||
}
|
||||
|
||||
public class ItemViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView document_list_item_title;
|
||||
TextView document_list_item_description;
|
||||
TextView document_list_item_updated_at;
|
||||
|
||||
|
||||
public ItemViewHolder(View itemView) {
|
||||
super(itemView);
|
||||
document_list_item_title = itemView.findViewById(R.id.document_list_item_title);
|
||||
document_list_item_description = itemView.findViewById(R.id.document_list_item_description);
|
||||
document_list_item_updated_at = itemView.findViewById(R.id.document_list_item_updated_at);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuListItemAdapter;
|
||||
import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
|
||||
|
||||
@@ -20,6 +21,7 @@ import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
|
||||
* Use the {@link DebugMenuTopFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class DebugMenuTopFragment extends Fragment {
|
||||
public DebugMenuTopFragment() {
|
||||
// Required empty public constructor
|
||||
@@ -46,9 +48,11 @@ public class DebugMenuTopFragment extends Fragment {
|
||||
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
|
||||
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
|
||||
|
||||
debugMenuListItems.add(new DebugMenuListItem("Meta Data", "View meta data", R.id.action_debugMenuTopFragment_to_debugMenuMetaDataFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("ScannerStub", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerManagerFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("VCS", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment, true));
|
||||
|
||||
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
||||
recyclerView.setAdapter(adapter);
|
||||
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
package one.nem.lacerta.feature.debug;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuVcsGeneralActionFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class DebugMenuVcsGeneralActionFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
public DebugMenuVcsGeneralActionFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuVcsGeneralActionFragment newInstance() {
|
||||
DebugMenuVcsGeneralActionFragment fragment = new DebugMenuVcsGeneralActionFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_general_action, container, false);
|
||||
|
||||
view.findViewById(R.id.add_sample_log_rev_button).setOnClickListener(v -> {
|
||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create("example_id");
|
||||
lacertaVcs.insertPage(1, "example_id");
|
||||
});
|
||||
|
||||
return view;
|
||||
}
|
||||
}
|
||||
+59
@@ -0,0 +1,59 @@
|
||||
package one.nem.lacerta.feature.debug;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuListItemAdapter;
|
||||
import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuVcsGeneralFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class DebugMenuVcsGeneralFragment extends Fragment {
|
||||
public DebugMenuVcsGeneralFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuVcsGeneralFragment newInstance() {
|
||||
DebugMenuVcsGeneralFragment fragment = new DebugMenuVcsGeneralFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_general, container, false);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
|
||||
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
|
||||
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
|
||||
|
||||
debugMenuListItems.add(new DebugMenuListItem("General Action", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("Log Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment, true));
|
||||
debugMenuListItems.add(new DebugMenuListItem("Rev Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment, true));
|
||||
|
||||
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
||||
recyclerView.setAdapter(adapter);
|
||||
|
||||
return view;
|
||||
}
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
package one.nem.lacerta.feature.debug;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuVcsLogRecordFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class DebugMenuVcsLogRecordFragment extends Fragment {
|
||||
|
||||
public DebugMenuVcsLogRecordFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuVcsLogRecordFragment newInstance() {
|
||||
DebugMenuVcsLogRecordFragment fragment = new DebugMenuVcsLogRecordFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_log_record, container, false);
|
||||
|
||||
return view;
|
||||
}
|
||||
}
|
||||
+8
-6
@@ -10,16 +10,16 @@ import android.view.ViewGroup;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link DebugMenuMetaDataFragment#newInstance} factory method to
|
||||
* Use the {@link DebugMenuVcsRevRecordFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class DebugMenuMetaDataFragment extends Fragment {
|
||||
public DebugMenuMetaDataFragment() {
|
||||
public class DebugMenuVcsRevRecordFragment extends Fragment {
|
||||
public DebugMenuVcsRevRecordFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static DebugMenuMetaDataFragment newInstance() {
|
||||
DebugMenuMetaDataFragment fragment = new DebugMenuMetaDataFragment();
|
||||
public static DebugMenuVcsRevRecordFragment newInstance() {
|
||||
DebugMenuVcsRevRecordFragment fragment = new DebugMenuVcsRevRecordFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
@@ -34,6 +34,8 @@ public class DebugMenuMetaDataFragment extends Fragment {
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_debug_menu_meta_data, container, false);
|
||||
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_rev_record, container, false);
|
||||
|
||||
return view;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:theme="@style/Theme.Lacerta"
|
||||
tools:context=".DebugMenuDocProcessorTesterFragment" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="1dp"
|
||||
android:layout_marginTop="1dp"
|
||||
android:layout_marginEnd="1dp"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_gen_random_img"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Generate random image" />
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -1,60 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".DebugMenuDocumentTesterManageFragment" >
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:layout_margin="16dp"
|
||||
android:background="@drawable/rounded_secondary_container">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="16dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/colorOnSecondaryContainer"
|
||||
android:text="Debug actions" />
|
||||
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="Document title"
|
||||
android:id="@+id/edit_text_document_title"
|
||||
android:layout_margin="16dp"
|
||||
android:inputType="text"
|
||||
android:textSize="16sp"
|
||||
style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_insert_test_data"
|
||||
style="@style/Widget.Material3.Button.OutlinedButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:text="Insert test data"/>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
+3
-3
@@ -4,11 +4,11 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".DebugMenuDocumentTesterListFragment" >
|
||||
tools:context=".DebugMenuLibraryItemListPageFragment">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recycler_view_document_list"
|
||||
android:layout_width="match_parent"
|
||||
android:id="@+id/item_recycler_view"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".DebugMenuMetaDataFragment">
|
||||
|
||||
<!-- TODO: Update blank fragment layout -->
|
||||
|
||||
|
||||
|
||||
</FrameLayout>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".DebugMenuVcsGeneralFragment">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recycler_view"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".DebugMenuVcsGeneralActionFragment">
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<Button
|
||||
android:id="@+id/add_sample_log_rev_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Add Sample log/Rev" />
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".DebugMenuVcsGeneralFragment">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/log_recycler_view"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".DebugMenuVcsGeneralFragment">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rev_recycler_view"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -23,4 +23,6 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
|
||||
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -10,45 +10,69 @@
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuTopFragment"
|
||||
android:label="fragment_debug_menu_top"
|
||||
tools:layout="@layout/fragment_debug_menu_top" >
|
||||
<action
|
||||
android:id="@+id/action_debugMenuTopFragment_to_debugMenuMetaDataFragment"
|
||||
app:destination="@id/debugMenuMetaDataFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment"
|
||||
app:destination="@id/debugMenuDocumentTesterTopFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuTopFragment_to_scannerDataManagerStubFragment"
|
||||
app:destination="@id/scannerDataManagerStubFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment"
|
||||
app:destination="@id/debugMenuLibraryItemListPageFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment"
|
||||
app:destination="@id/debugMenuVcsGeneralFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuTopFragment_to_scannerManagerFragment"
|
||||
app:destination="@id/scannerManagerFragment" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/debugMenuMetaDataFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuMetaDataFragment"
|
||||
android:label="fragment_debug_menu_meta_data"
|
||||
tools:layout="@layout/fragment_debug_menu_meta_data" />
|
||||
<fragment
|
||||
android:id="@+id/debugMenuDocumentTesterTopFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
|
||||
android:label="fragment_debug_menu_document_tester_top"
|
||||
tools:layout="@layout/fragment_debug_menu_document_tester_top" >
|
||||
<action
|
||||
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment"
|
||||
app:destination="@id/debugMenuDocumentTesterListFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment"
|
||||
app:destination="@id/debugMenuDocumentTesterManageFragment" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/debugMenuDocumentTesterListFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterListFragment"
|
||||
android:label="fragment_debug_menu_document_tester_list"
|
||||
tools:layout="@layout/fragment_debug_menu_document_tester_list" />
|
||||
<fragment
|
||||
android:id="@+id/debugMenuDocumentTesterManageFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterManageFragment"
|
||||
android:label="fragment_debug_menu_document_tester_manage"
|
||||
tools:layout="@layout/fragment_debug_menu_document_tester_manage" />
|
||||
<fragment
|
||||
android:id="@+id/scannerDataManagerStubFragment"
|
||||
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
|
||||
android:label="ScannerDataManagerStubFragment" />
|
||||
<fragment
|
||||
android:id="@+id/debugMenuLibraryItemListPageFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuLibraryItemListPageFragment"
|
||||
android:label="fragment_debug_menu_library_item_list_page"
|
||||
tools:layout="@layout/fragment_debug_menu_library_item_list_page" />
|
||||
<fragment
|
||||
android:id="@+id/debugMenuVcsGeneralFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralFragment"
|
||||
android:label="fragment_debug_menu_vcs_general"
|
||||
tools:layout="@layout/fragment_debug_menu_vcs_general" >
|
||||
<action
|
||||
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment"
|
||||
app:destination="@id/debugMenuVcsGeneralActionFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment"
|
||||
app:destination="@id/debugMenuVcsRevRecordFragment" />
|
||||
<action
|
||||
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment"
|
||||
app:destination="@id/debugMenuVcsLogRecordFragment" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/debugMenuVcsGeneralActionFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralActionFragment"
|
||||
android:label="fragment_debug_menu_vcs_general_action"
|
||||
tools:layout="@layout/fragment_debug_menu_vcs_general_action" />
|
||||
<fragment
|
||||
android:id="@+id/debugMenuVcsLogRecordFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsLogRecordFragment"
|
||||
android:label="fragment_debug_menu_vcs_log_record"
|
||||
tools:layout="@layout/fragment_debug_menu_vcs_log_record" />
|
||||
<fragment
|
||||
android:id="@+id/debugMenuVcsRevRecordFragment"
|
||||
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsRevRecordFragment"
|
||||
android:label="fragment_debug_menu_vcs_rev_record"
|
||||
tools:layout="@layout/fragment_debug_menu_vcs_rev_record" />
|
||||
<fragment
|
||||
android:id="@+id/scannerManagerFragment"
|
||||
android:name="one.nem.lacerta.component.scanner.ScannerManagerFragment"
|
||||
android:label="ScannerManagerFragment" />
|
||||
</navigation>
|
||||
@@ -1,4 +1,5 @@
|
||||
plugins {
|
||||
id 'com.google.dagger.hilt.android'
|
||||
id 'com.android.library'
|
||||
}
|
||||
|
||||
@@ -29,6 +30,8 @@ dependencies {
|
||||
|
||||
implementation libs.androidx.appcompat
|
||||
implementation libs.com.google.android.material
|
||||
implementation project(path: ':feature:debug')
|
||||
implementation project(path: ':utils')
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
@@ -38,6 +41,18 @@ dependencies {
|
||||
implementation libs.navigation.ui
|
||||
implementation libs.navigation.dynamic.features.fragment
|
||||
|
||||
// DI
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
|
||||
// shared
|
||||
implementation project(':shared:ui')
|
||||
|
||||
// DI
|
||||
implementation project(':data')
|
||||
|
||||
//model
|
||||
implementation project(':model')
|
||||
|
||||
implementation "androidx.recyclerview:recyclerview:1.3.2"
|
||||
}
|
||||
+2
@@ -22,5 +22,7 @@ public class ExampleInstrumentedTest {
|
||||
// Context of the app under test.
|
||||
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||
assertEquals("one.nem.lacerta.feature.home.test", appContext.getPackageName());
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,20 +1,40 @@
|
||||
package one.nem.lacerta.feature.home;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.util.Log;
|
||||
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.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.ListItem;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link HomeTopFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class HomeTopFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
private static final String ARG_PARAM1 = "param1";
|
||||
@@ -46,12 +66,15 @@ public class HomeTopFragment extends Fragment {
|
||||
return fragment;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,6 +82,42 @@ public class HomeTopFragment extends Fragment {
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_home_top, container, false);
|
||||
}
|
||||
}
|
||||
View view = inflater.inflate(R.layout.fragment_home_top, container, false);
|
||||
|
||||
// List<DocumentMeta> metas = document.getAllDocumentMetas(100);
|
||||
|
||||
ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(100);
|
||||
|
||||
Log.d("docs", Integer.toString(listItems.size()));
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
|
||||
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||
|
||||
MyAdapter myAdapter = new MyAdapter(listItems);
|
||||
|
||||
recyclerView.setAdapter(myAdapter);
|
||||
|
||||
return view;
|
||||
|
||||
|
||||
}
|
||||
String pageTitle;
|
||||
String pageId;
|
||||
ArrayList listItems;
|
||||
|
||||
String title;
|
||||
String description;
|
||||
|
||||
String itemId;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
package one.nem.lacerta.feature.home;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyAdapterViewHolder> {
|
||||
|
||||
ArrayList<ListItem> listItems;
|
||||
|
||||
public MyAdapter(ArrayList<ListItem> listItems) {
|
||||
this.listItems = listItems;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public MyAdapterViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_home_document, parent, false);
|
||||
return new MyAdapterViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull MyAdapterViewHolder holder, int position) {
|
||||
|
||||
|
||||
holder.title.setText(listItems.get(position).getTitle());
|
||||
holder.description.setText(listItems.get(position).getDescription());
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return listItems.size();
|
||||
}
|
||||
|
||||
public class MyAdapterViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
|
||||
TextView description;
|
||||
|
||||
public MyAdapterViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = itemView.findViewById(R.id.debug_menu_item_title);
|
||||
description = itemView.findViewById(R.id.debug_menu_item_description);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,19 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".HomeTopFragment">
|
||||
tools:context=".HomeTopFragment"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
|
||||
<!-- TODO: Update blank fragment layout -->
|
||||
<TextView
|
||||
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/item_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="@string/hello_blank_fragment" />
|
||||
android:layout_height="match_parent">
|
||||
|
||||
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
</FrameLayout>
|
||||
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="16dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/debug_menu_item_title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16sp"
|
||||
android:layout_marginEnd="8dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/debug_menu_item_description"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/debug_menu_item_updated_at_home"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:text="Updated at: aaaaaaaaaa"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<item name="my_recycler_view" type="id" />
|
||||
<item name="TITLE" type="id" />
|
||||
<item name="textView" type="id" />
|
||||
</resources>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources></resources>
|
||||
@@ -1,4 +1,5 @@
|
||||
<resources>
|
||||
<!-- TODO: Remove or change this placeholder text -->
|
||||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||
<string name="textview">TextView</string>
|
||||
</resources>
|
||||
@@ -1,5 +1,6 @@
|
||||
plugins {
|
||||
id 'com.android.library'
|
||||
id 'com.google.dagger.hilt.android'
|
||||
}
|
||||
|
||||
android {
|
||||
@@ -46,5 +47,9 @@ dependencies {
|
||||
|
||||
implementation project(':shared:ui')
|
||||
|
||||
implementation project(':model')
|
||||
|
||||
implementation project(':data')
|
||||
|
||||
|
||||
}
|
||||
@@ -10,12 +10,18 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
|
||||
public class DocumentAdapter extends RecyclerView.Adapter<DocumentAdapter.DocumentViewHolder> {
|
||||
|
||||
private List<String> documentList;
|
||||
private List<DocumentMeta> documentMetas;
|
||||
|
||||
public DocumentAdapter(List<String> documentList) {
|
||||
this.documentList = documentList;
|
||||
public DocumentAdapter(List<DocumentMeta> documentMetas) {
|
||||
// nullの場合に例外を発生させる
|
||||
if (documentMetas == null) {
|
||||
throw new IllegalArgumentException("DocumentMetas list cannot be null or empty");
|
||||
}
|
||||
this.documentMetas = documentMetas;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@@ -27,12 +33,15 @@ public class DocumentAdapter extends RecyclerView.Adapter<DocumentAdapter.Docume
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull DocumentViewHolder holder, int position) {
|
||||
holder.title.setText(documentList.get(position));
|
||||
DocumentMeta documentMeta = documentMetas.get(position);
|
||||
if (documentMeta != null) {
|
||||
holder.title.setText(documentMeta.getTitle());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return documentList.size();
|
||||
return documentMetas.size();
|
||||
}
|
||||
|
||||
class DocumentViewHolder extends RecyclerView.ViewHolder {
|
||||
@@ -40,7 +49,7 @@ public class DocumentAdapter extends RecyclerView.Adapter<DocumentAdapter.Docume
|
||||
|
||||
DocumentViewHolder(View itemView) {
|
||||
super(itemView);
|
||||
title = itemView.findViewById(R.id.debug_menu_item_title);
|
||||
title = itemView.findViewById(R.id.debug_menu_item_title); // 適切な id に変更する
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
@@ -8,6 +8,9 @@ import android.widget.TextView;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
// LibraryArchiveFragment.java
|
||||
|
||||
//画面変移用のコード
|
||||
//Fragmentへのデータの受け渡し機能
|
||||
public class LibraryArchiveFragment extends AppCompatActivity {
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
||||
@@ -8,6 +8,7 @@ import android.widget.TextView;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
//Fragmentにデータを受け渡す機能
|
||||
public class LibraryDocFragment extends Fragment {
|
||||
|
||||
private TextView textView; // フィールドとして TextView を定義
|
||||
|
||||
+21
-6
@@ -13,17 +13,31 @@ import android.view.ViewGroup;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
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.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 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
|
||||
// Document document;
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
private static final String ARG_PARAM1 = "param1";
|
||||
@@ -76,14 +90,15 @@ public class LibraryTopFragment extends Fragment {
|
||||
LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
|
||||
documentRecyclerView.setLayoutManager(layoutManager);
|
||||
|
||||
List<String> documentList = new ArrayList<>();
|
||||
documentList.add("Document A");
|
||||
documentList.add("Document B");
|
||||
documentList.add("Document C");
|
||||
//データを取得
|
||||
|
||||
// List<DocumentMeta> metas = document.getAllDocumentMetas(100);
|
||||
|
||||
// Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
|
||||
|
||||
// Create and set the adapter
|
||||
DocumentAdapter adapter = new DocumentAdapter(documentList);
|
||||
documentRecyclerView.setAdapter(adapter);
|
||||
// DocumentAdapter adapter = new DocumentAdapter(metas);
|
||||
// documentRecyclerView.setAdapter(adapter);
|
||||
|
||||
// Use a LinearLayoutManager to specify the layout
|
||||
return view;
|
||||
|
||||
@@ -27,9 +27,17 @@ android {
|
||||
|
||||
dependencies {
|
||||
|
||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||
implementation 'com.google.android.material:material:1.10.0'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
||||
implementation libs.androidx.appcompat
|
||||
implementation libs.com.google.android.material
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
|
||||
// Navigation
|
||||
implementation libs.navigation.fragment
|
||||
implementation libs.navigation.ui
|
||||
implementation libs.navigation.dynamic.features.fragment
|
||||
|
||||
// shared
|
||||
implementation project(':shared:ui')
|
||||
}
|
||||
@@ -0,0 +1,142 @@
|
||||
package one.nem.lacerta.feature.search;
|
||||
|
||||
import android.app.LauncherActivity;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.SearchView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link SearchTopFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class SearchTopFragment extends Fragment {
|
||||
private static final String TAG = SearchTopFragment.class.getSimpleName();
|
||||
private final SearchTopFragment self = this;
|
||||
|
||||
private SearchView searchView;
|
||||
private String searchWord;
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
private static final String ARG_PARAM1 = "param1";
|
||||
private static final String ARG_PARAM2 = "param2";
|
||||
|
||||
// TODO: Rename and change types of parameters
|
||||
private String mParam1;
|
||||
private String mParam2;
|
||||
|
||||
public SearchTopFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
/**
|
||||
* Use this factory method to create a new instance of
|
||||
* this fragment using the provided parameters.
|
||||
*
|
||||
* @param param1 Parameter 1.
|
||||
* @param param2 Parameter 2.
|
||||
* @return A new instance of fragment SearchTopFragment.
|
||||
*/
|
||||
// TODO: Rename and change types and number of parameters
|
||||
public static SearchTopFragment newInstance(String param1, String param2) {
|
||||
SearchTopFragment fragment = new SearchTopFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString(ARG_PARAM1, param1);
|
||||
args.putString(ARG_PARAM2, param2);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_search_top, container, false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||
super.onCreateOptionsMenu(menu, inflater);
|
||||
|
||||
|
||||
|
||||
|
||||
this.searchView.setIconifiedByDefault(true);
|
||||
|
||||
|
||||
this.searchView.setSubmitButtonEnabled(false);
|
||||
|
||||
|
||||
if (!this.searchWord.equals("")) {
|
||||
|
||||
this.searchView.setQuery(this.searchWord, false);
|
||||
} else {
|
||||
String queryHint = self.getResources().getString(R.string.hello_blank_fragment);
|
||||
|
||||
this.searchView.setQueryHint(queryHint);
|
||||
}
|
||||
this.searchView.setOnQueryTextListener(self.onQueryTextListener);
|
||||
}
|
||||
|
||||
private final SearchView.OnQueryTextListener onQueryTextListener = new SearchView.OnQueryTextListener() {
|
||||
@Override
|
||||
public boolean onQueryTextSubmit(String query) {
|
||||
|
||||
return self.setSearchWord(searchWord);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onQueryTextChange(String query) {
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
private boolean setSearchWord(String query) {
|
||||
|
||||
|
||||
if (searchWord != null && !searchWord.equals("")) {
|
||||
|
||||
this.searchWord = searchWord;
|
||||
}
|
||||
|
||||
this.searchView.setIconified(false);
|
||||
|
||||
this.searchView.onActionViewCollapsed();
|
||||
|
||||
this.searchView.clearFocus();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
interface LacertaSearch {
|
||||
ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit);
|
||||
|
||||
ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit, int offset);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<?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"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
tools:context=".SearchTopFragment">
|
||||
|
||||
<!-- TODO: Update blank fragment layout -->
|
||||
<com.google.android.material.appbar.MaterialToolbar
|
||||
android:id="@+id/Search_tool_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="69dp"
|
||||
android:background="#E4E8EA"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
android:theme="?attr/actionBarTheme"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:title="" />
|
||||
|
||||
<SearchView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
|
||||
</FrameLayout>
|
||||
@@ -0,0 +1,13 @@
|
||||
<?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/feature_search_navigation"
|
||||
app:startDestination="@id/searchTopFragment">
|
||||
|
||||
<fragment
|
||||
android:id="@+id/searchTopFragment"
|
||||
android:name="one.nem.lacerta.feature.search.SearchTopFragment"
|
||||
android:label="fragment_search_top"
|
||||
tools:layout="@layout/fragment_search_top" />
|
||||
</navigation>
|
||||
@@ -0,0 +1,4 @@
|
||||
<resources>
|
||||
<!-- TODO: Remove or change this placeholder text -->
|
||||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||
</resources>
|
||||
@@ -36,4 +36,6 @@ dependencies {
|
||||
// JGit
|
||||
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
|
||||
|
||||
implementation project(":shared:ui")
|
||||
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package one.nem.lacerta.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class LibraryItemPage {
|
||||
|
||||
String pageTitle;
|
||||
String pageId;
|
||||
ArrayList<ListItem> listItems;
|
||||
|
||||
// Constructor
|
||||
|
||||
public LibraryItemPage(String pageTitle, String pageId, ArrayList<ListItem> listItems) {
|
||||
this.pageTitle = pageTitle;
|
||||
this.pageId = pageId;
|
||||
this.listItems = listItems;
|
||||
}
|
||||
|
||||
public LibraryItemPage() {
|
||||
// Empty constructor
|
||||
}
|
||||
|
||||
// Getter
|
||||
|
||||
public String getPageTitle() {
|
||||
return pageTitle;
|
||||
}
|
||||
|
||||
public String getPageId() {
|
||||
return pageId;
|
||||
}
|
||||
|
||||
public ArrayList<ListItem> getListItems() {
|
||||
return listItems;
|
||||
}
|
||||
|
||||
// Setter
|
||||
|
||||
public void setPageTitle(String pageTitle) {
|
||||
this.pageTitle = pageTitle;
|
||||
}
|
||||
|
||||
public void setPageId(String pageId) {
|
||||
this.pageId = pageId;
|
||||
}
|
||||
|
||||
public void setListItems(ArrayList<ListItem> listItems) {
|
||||
this.listItems = listItems;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package one.nem.lacerta.model;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
||||
public class ListItem {
|
||||
|
||||
// Properties
|
||||
|
||||
String title;
|
||||
String description;
|
||||
ListItemType itemType;
|
||||
String itemId;
|
||||
|
||||
// Constructor
|
||||
|
||||
public ListItem(String title, String description, ListItemType itemType, String itemId) {
|
||||
this.title = title;
|
||||
this.description = description;
|
||||
this.itemType = itemType;
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public ListItem() {
|
||||
// Empty constructor
|
||||
}
|
||||
|
||||
// Getter
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public ListItemType getItemType() {
|
||||
return itemType;
|
||||
}
|
||||
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
// Setter
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public void setItemType(ListItemType itemType) {
|
||||
this.itemType = itemType;
|
||||
}
|
||||
|
||||
public void setItemId(String itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package one.nem.lacerta.model;
|
||||
|
||||
public enum ListItemType {
|
||||
|
||||
ITEM_TYPE_FOLDER(one.nem.lacerta.shared.ui.R.drawable.folder_24px),
|
||||
ITEM_TYPE_DOCUMENT(one.nem.lacerta.shared.ui.R.drawable.description_24px);
|
||||
|
||||
private int iconId;
|
||||
|
||||
ListItemType(int iconId) {
|
||||
this.iconId = iconId;
|
||||
}
|
||||
|
||||
public int getIconId() {
|
||||
return iconId;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package one.nem.lacerta.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PublicPath {
|
||||
/*
|
||||
* ユーザーが扱うパス(内部パスの代替)
|
||||
* (時間がないのでInjectされることは考慮しない)
|
||||
*
|
||||
* TODO-rca:
|
||||
* - こわれたパスを検知する
|
||||
* - バリデーション
|
||||
*/
|
||||
|
||||
List<String> path = new ArrayList<String>();
|
||||
|
||||
public PublicPath() {
|
||||
}
|
||||
|
||||
public PublicPath(List<String> path) {
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
private void add(String path) {
|
||||
this.path.add(path);
|
||||
}
|
||||
|
||||
private void resolveInternal(String path) {
|
||||
if (path.equals("..")) {
|
||||
this.path.remove(this.path.size() - 1);
|
||||
} else {
|
||||
add(path);
|
||||
}
|
||||
}
|
||||
|
||||
public PublicPath resolve(String path) {
|
||||
resolveInternal(path);
|
||||
return this;
|
||||
}
|
||||
|
||||
public PublicPath resolve(List<String> path) {
|
||||
for (String p : path) {
|
||||
resolveInternal(p);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
public PublicPath resolve(PublicPath path) {
|
||||
for (String p : path.getPath()) {
|
||||
resolveInternal(p);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
public PublicPath parent() {
|
||||
this.path.remove(this.path.size() - 1);
|
||||
return this;
|
||||
}
|
||||
|
||||
public List<String> getPath() {
|
||||
return path;
|
||||
}
|
||||
|
||||
public String getStringPath() {
|
||||
return String.join("/", path);
|
||||
}
|
||||
|
||||
public PublicPath getRoot() {
|
||||
PublicPath root = new PublicPath();
|
||||
root.add("/");
|
||||
return root;
|
||||
}
|
||||
}
|
||||
@@ -3,11 +3,14 @@ package one.nem.lacerta.model.document;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
|
||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
|
||||
import one.nem.lacerta.model.document.page.Page;
|
||||
|
||||
/**
|
||||
* ドキュメントの詳細データ
|
||||
*/
|
||||
@@ -19,31 +22,21 @@ public class DocumentDetail {
|
||||
DocumentMeta meta;
|
||||
|
||||
/**
|
||||
* ドキュメントのパス(DocumentPathインスタンス)
|
||||
* ドキュメントのページ(Pageインスタンスのリスト)
|
||||
*/
|
||||
DocumentPath path;
|
||||
|
||||
/**
|
||||
* ドキュメントの作者(String)
|
||||
*/
|
||||
String author;
|
||||
|
||||
/**
|
||||
* ドキュメントのデフォルトブランチ(String)
|
||||
*/
|
||||
String defaultBranch;
|
||||
|
||||
Repository repository;
|
||||
ArrayList<Page> pages;
|
||||
|
||||
// Constructor
|
||||
public DocumentDetail() {
|
||||
}
|
||||
|
||||
public DocumentDetail(DocumentMeta meta, DocumentPath path, String author, String defaultBranch) {
|
||||
public DocumentDetail(DocumentMeta meta) {
|
||||
this.meta = meta;
|
||||
this.path = path;
|
||||
this.author = author;
|
||||
this.defaultBranch = defaultBranch;
|
||||
}
|
||||
|
||||
public DocumentDetail(DocumentMeta meta, ArrayList<Page> pages) {
|
||||
this.meta = meta;
|
||||
this.pages = pages;
|
||||
}
|
||||
|
||||
// Getter
|
||||
@@ -56,34 +49,12 @@ public class DocumentDetail {
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのパス(DocumentPathインスタンス)を取得する
|
||||
* ドキュメントのページ(Pageインスタンスのリスト)を取得する
|
||||
*/
|
||||
public DocumentPath getPath() {
|
||||
return path;
|
||||
public ArrayList<Page> getPages() {
|
||||
return pages;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントの作者(String)を取得する
|
||||
*/
|
||||
public String getAuthor() {
|
||||
return author;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのデフォルトブランチ(String)を取得する
|
||||
*/
|
||||
public String getDefaultBranch() {
|
||||
return defaultBranch;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのリポジトリを取得する
|
||||
*/
|
||||
public Repository getRepository() {
|
||||
return repository;
|
||||
}
|
||||
|
||||
|
||||
// Setter
|
||||
|
||||
/**
|
||||
@@ -95,34 +66,13 @@ public class DocumentDetail {
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのパス(DocumentPathインスタンス)を設定する
|
||||
* @param path DocumentPathインスタンス
|
||||
* ドキュメントのページ(Pageインスタンスのリスト)を設定する
|
||||
* @param pages Pageインスタンスのリスト
|
||||
*/
|
||||
public void setPath(DocumentPath path) {
|
||||
this.path = path;
|
||||
public void setPages(ArrayList<Page> pages) {
|
||||
this.pages = pages;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントの作者(String)を設定する
|
||||
* @param author ドキュメントの作者
|
||||
*/
|
||||
public void setAuthor(String author) {
|
||||
this.author = author;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのデフォルトブランチ(String)を設定する
|
||||
* @param defaultBranch ドキュメントのデフォルトブランチ
|
||||
*/
|
||||
public void setDefaultBranch(String defaultBranch) {
|
||||
this.defaultBranch = defaultBranch;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのリポジトリを設定する
|
||||
*/
|
||||
public void setRepository(Repository repository) {
|
||||
this.repository = repository;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package one.nem.lacerta.model.document;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.model.PublicPath;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
@@ -9,7 +11,7 @@ import java.util.UUID;
|
||||
/**
|
||||
* ドキュメントのメタデータ
|
||||
*/
|
||||
public class DocumentMeta {
|
||||
public class DocumentMeta { // TODO-rca: JavaDoc対応
|
||||
/**
|
||||
* ドキュメントのID(String)
|
||||
*/
|
||||
@@ -35,42 +37,63 @@ public class DocumentMeta {
|
||||
*/
|
||||
List<DocumentTag> tags;
|
||||
|
||||
PublicPath path;
|
||||
|
||||
String author;
|
||||
|
||||
String defaultBranch;
|
||||
|
||||
// Constructor
|
||||
|
||||
public DocumentMeta() {
|
||||
}
|
||||
|
||||
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags) { // With all
|
||||
public DocumentMeta(String title) {
|
||||
this.id = UUID.randomUUID().toString();
|
||||
this.title = title;
|
||||
this.tags = new ArrayList<>();
|
||||
this.author = ""; // TODO-rca: 作者のデフォルト値を設定できるようにする
|
||||
this.defaultBranch = "main"; // TODO-rca: デフォルトブランチのデフォルト値を設定できるようにする
|
||||
this.path = new PublicPath().getRoot();
|
||||
this.updatedAt = new Date();
|
||||
this.createdAt = new Date();
|
||||
}
|
||||
|
||||
public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
|
||||
this.id = UUID.randomUUID().toString();
|
||||
this.title = title;
|
||||
this.tags = tags;
|
||||
this.author = author;
|
||||
this.defaultBranch = defaultBranch;
|
||||
}
|
||||
|
||||
public DocumentMeta(String id, String title, List<DocumentTag> tags, String author, String defaultBranch) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.tags = tags;
|
||||
this.author = author;
|
||||
this.defaultBranch = defaultBranch;
|
||||
}
|
||||
|
||||
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, String author, String defaultBranch) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.updatedAt = updatedAt;
|
||||
this.createdAt = createdAt;
|
||||
this.tags = tags;
|
||||
this.author = author;
|
||||
this.defaultBranch = defaultBranch;
|
||||
}
|
||||
|
||||
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt) { // Without tags
|
||||
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, String author, String defaultBranch) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.updatedAt = updatedAt;
|
||||
this.createdAt = createdAt;
|
||||
this.tags = new ArrayList<>();
|
||||
}
|
||||
|
||||
public DocumentMeta(String id, String title) { // Without tags, updatedAt, createdAt
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
// 現在時刻を設定
|
||||
this.updatedAt = new Date();
|
||||
this.createdAt = new Date();
|
||||
this.tags = new ArrayList<>();
|
||||
}
|
||||
|
||||
public DocumentMeta(String title) { // title only
|
||||
this.id = UUID.randomUUID().toString(); // 新規作成時想定なのでコンストラクタで生成してしまう(使う人が楽なので)
|
||||
this.title = title;
|
||||
// 現在時刻を設定
|
||||
this.updatedAt = new Date();
|
||||
this.createdAt = new Date();
|
||||
this.tags = new ArrayList<>();
|
||||
this.tags = tags;
|
||||
this.path = path;
|
||||
this.author = author;
|
||||
this.defaultBranch = defaultBranch;
|
||||
}
|
||||
|
||||
// Getter
|
||||
@@ -121,6 +144,27 @@ public class DocumentMeta {
|
||||
return tagIds;
|
||||
}
|
||||
|
||||
/**
|
||||
* PublicPathを取得する
|
||||
*/
|
||||
public PublicPath getPath() {
|
||||
return path;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントの作者(String)を取得する
|
||||
*/
|
||||
public String getAuthor() {
|
||||
return author;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのデフォルトブランチ(String)を取得する
|
||||
*/
|
||||
public String getDefaultBranch() {
|
||||
return defaultBranch;
|
||||
}
|
||||
|
||||
// Setter
|
||||
|
||||
/**
|
||||
@@ -163,6 +207,30 @@ public class DocumentMeta {
|
||||
this.tags = tags;
|
||||
}
|
||||
|
||||
/**
|
||||
* PublicPathを設定する
|
||||
* @param path PublicPath
|
||||
*/
|
||||
public void setPath(PublicPath path) {
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントの作者(String)を設定する
|
||||
* @param author ドキュメントの作者
|
||||
*/
|
||||
public void setAuthor(String author) {
|
||||
this.author = author;
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメントのデフォルトブランチ(String)を設定する
|
||||
* @param defaultBranch ドキュメントのデフォルトブランチ
|
||||
*/
|
||||
public void setDefaultBranch(String defaultBranch) {
|
||||
this.defaultBranch = defaultBranch;
|
||||
}
|
||||
|
||||
/**
|
||||
* updatedAtを現在時刻に設定する
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package one.nem.lacerta.model.document.internal;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class XmlMetaModel {
|
||||
|
||||
String revisionId;
|
||||
|
||||
ArrayList<XmlMetaPageModel> pages;
|
||||
|
||||
// Constructor
|
||||
|
||||
public XmlMetaModel() {
|
||||
}
|
||||
|
||||
public XmlMetaModel(String revisionId, ArrayList<XmlMetaPageModel> pages) {
|
||||
this.revisionId = revisionId;
|
||||
this.pages = pages;
|
||||
}
|
||||
|
||||
// Getter
|
||||
|
||||
public String getRevisionId() {
|
||||
return revisionId;
|
||||
}
|
||||
|
||||
public ArrayList<XmlMetaPageModel> getPages() {
|
||||
return pages;
|
||||
}
|
||||
|
||||
// Setter
|
||||
|
||||
public void setRevisionId(String revisionId) {
|
||||
this.revisionId = revisionId;
|
||||
}
|
||||
|
||||
public void setPages(ArrayList<XmlMetaPageModel> pages) {
|
||||
this.pages = pages;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package one.nem.lacerta.model.document.internal;
|
||||
|
||||
public class XmlMetaPageModel {
|
||||
|
||||
String filename;
|
||||
|
||||
// Constructor
|
||||
|
||||
public XmlMetaPageModel() {
|
||||
}
|
||||
|
||||
public XmlMetaPageModel(String filename) {
|
||||
this.filename = filename;
|
||||
}
|
||||
|
||||
// Getter
|
||||
|
||||
public String getFilename() {
|
||||
return filename;
|
||||
}
|
||||
|
||||
// Setter
|
||||
|
||||
public void setFilename(String filename) {
|
||||
this.filename = filename;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package one.nem.lacerta.model.document.page;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
|
||||
public class Page {
|
||||
|
||||
String fileName;
|
||||
Bitmap bitmap;
|
||||
|
||||
// Constructor
|
||||
|
||||
public Page() {
|
||||
}
|
||||
|
||||
public Page(String fileName, Bitmap bitmap) {
|
||||
this.fileName = fileName;
|
||||
this.bitmap = bitmap;
|
||||
}
|
||||
|
||||
// Getter
|
||||
|
||||
public String getFileName() {
|
||||
return fileName;
|
||||
}
|
||||
|
||||
public Bitmap getBitmap() {
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
// Setter
|
||||
|
||||
public void setFileName(String fileName) {
|
||||
this.fileName = fileName;
|
||||
}
|
||||
|
||||
public void setBitmap(Bitmap bitmap) {
|
||||
this.bitmap = bitmap;
|
||||
}
|
||||
}
|
||||
@@ -32,4 +32,17 @@ dependencies {
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
|
||||
// DI
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
|
||||
// JGit
|
||||
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
|
||||
|
||||
implementation project(':model')
|
||||
implementation project(':source')
|
||||
implementation project(':utils')
|
||||
implementation project(':data')
|
||||
implementation project(':vcs')
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package one.nem.lacerta.processor;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
|
||||
public interface DocumentProcessor {
|
||||
|
||||
// ページ操作
|
||||
void addNewPageToLast(Bitmap bitmap) throws Exception;
|
||||
void addNewPagesToLast(Bitmap[] bitmaps) throws Exception;
|
||||
void insertPageAtIndex(Bitmap bitmap, int index) throws Exception;
|
||||
void removePageAtIndex(int index) throws Exception;
|
||||
|
||||
// 更新
|
||||
void updatePageAtIndex(Bitmap bitmap, int index);
|
||||
|
||||
// ページ取得
|
||||
Bitmap getPageAtIndex(int index);
|
||||
int getPageCount();
|
||||
|
||||
DocumentDetail getDocumentDetail();
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
package one.nem.lacerta.processor.factory;
|
||||
|
||||
import dagger.assisted.AssistedFactory;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.processor.impl.DocumentProcessorImpl;
|
||||
|
||||
@AssistedFactory
|
||||
public interface DocumentProcessorFactory {
|
||||
DocumentProcessorImpl create(DocumentDetail documentDetail);
|
||||
}
|
||||
@@ -0,0 +1,138 @@
|
||||
package one.nem.lacerta.processor.impl;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.UUID;
|
||||
|
||||
// Hilt
|
||||
import dagger.assisted.Assisted;
|
||||
import dagger.assisted.AssistedInject;
|
||||
|
||||
// Lacerta/model
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.model.document.internal.XmlMetaModel;
|
||||
import one.nem.lacerta.model.document.page.Page;
|
||||
|
||||
// Lacerta/processor
|
||||
import one.nem.lacerta.processor.DocumentProcessor;
|
||||
|
||||
// Lacerta/source
|
||||
import one.nem.lacerta.source.file.FileManager;
|
||||
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
||||
|
||||
// Lacerta/utils
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
import one.nem.lacerta.utils.XmlMetaParser;
|
||||
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
||||
|
||||
// Lacerta/vcs
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
|
||||
public class DocumentProcessorImpl implements DocumentProcessor{
|
||||
|
||||
// Magic Numbers
|
||||
private static final String DEFAULT_SAVE_DIR = "raw";
|
||||
|
||||
// Variables
|
||||
private final DocumentDetail documentDetail;
|
||||
private XmlMetaModel xmlMetaModel;
|
||||
private Path documentRootPath;
|
||||
private FileManager fileManager;
|
||||
private LacertaVcs lacertaVcs;
|
||||
|
||||
// Injection
|
||||
private final FileManagerFactory fileManagerFactory;
|
||||
private final LacertaLogger logger;
|
||||
private final XmlMetaParser xmlMetaParser;
|
||||
private final LacertaVcsFactory lacertaVcsFactory;
|
||||
private final DeviceInfoUtils deviceInfoUtils;
|
||||
@AssistedInject
|
||||
public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, LacertaVcsFactory lacertaVcsFactory, DeviceInfoUtils deviceInfoUtils, @Assisted DocumentDetail documentDetail) {
|
||||
this.fileManagerFactory = fileManagerFactory;
|
||||
this.logger = logger;
|
||||
this.xmlMetaParser = xmlMetaParser;
|
||||
if (documentDetail == null) {
|
||||
throw new IllegalArgumentException("documentDetail must not be null");
|
||||
}
|
||||
this.lacertaVcsFactory = lacertaVcsFactory;
|
||||
this.documentDetail = documentDetail;
|
||||
this.deviceInfoUtils = deviceInfoUtils;
|
||||
|
||||
// Init
|
||||
this.documentRootPath = deviceInfoUtils.getExternalStorageDirectory().resolve(this.documentDetail.getMeta().getId());
|
||||
logger.debug("init", "documentRootPath: " + this.documentRootPath);
|
||||
this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager
|
||||
this.lacertaVcs = lacertaVcsFactory.create(this.documentDetail.getMeta().getId());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void addNewPageToLast(Bitmap bitmap) throws Exception{
|
||||
logger.debug("addNewPageToLast", "called");
|
||||
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
||||
|
||||
Page page = new Page();
|
||||
page.setFileName(filename);
|
||||
page.setBitmap(bitmap);
|
||||
this.documentDetail.getPages().add(page);
|
||||
|
||||
lacertaVcs.insertPage(documentDetail.getPages().size(), filename);
|
||||
|
||||
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
||||
|
||||
logger.info("addNewPageToLast", "finished");
|
||||
logger.info("addNewPageToLast", "filename: " + filename);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addNewPagesToLast(Bitmap[] bitmaps) throws Exception{
|
||||
logger.debug("addNewPagesToLast", "called");
|
||||
|
||||
for (Bitmap bitmap : bitmaps) {
|
||||
addNewPageToLast(bitmap);
|
||||
} // TODO-rca: 効率悪いので改善する
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertPageAtIndex(Bitmap bitmap, int index) throws Exception {
|
||||
logger.debug("addNewPageAfterIndex", "called");
|
||||
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
||||
|
||||
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
||||
|
||||
Page page = new Page();
|
||||
page.setFileName(filename);
|
||||
page.setBitmap(bitmap);
|
||||
this.documentDetail.getPages().add(index, page);
|
||||
|
||||
lacertaVcs.insertPage(index, filename);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removePageAtIndex(int index) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updatePageAtIndex(Bitmap bitmap, int index) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Bitmap getPageAtIndex(int index) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPageCount() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DocumentDetail getDocumentDetail() {
|
||||
return this.documentDetail;
|
||||
}
|
||||
}
|
||||
File renamed without changes.
@@ -0,0 +1,16 @@
|
||||
package one.nem.lacerta.processor.module;
|
||||
|
||||
import dagger.assisted.Assisted;
|
||||
import dagger.assisted.AssistedInject;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
|
||||
public class DocumentProcessorModule {
|
||||
|
||||
private final DocumentDetail documentDetail;
|
||||
|
||||
@AssistedInject
|
||||
public DocumentProcessorModule(@Assisted DocumentDetail documentDetail) {
|
||||
this.documentDetail = documentDetail;
|
||||
}
|
||||
|
||||
}
|
||||
File renamed without changes.
Whitespace-only changes.
@@ -0,0 +1,4 @@
|
||||
<resources>
|
||||
<!-- TODO: Remove or change this placeholder text -->
|
||||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||
</resources>
|
||||
+1
-1
@@ -30,4 +30,4 @@ include ':source'
|
||||
include ':model'
|
||||
include ':processor'
|
||||
include ':shared:ui'
|
||||
include ':shared:icon'
|
||||
include ':vcs'
|
||||
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path
|
||||
android:fillColor="@color/colorOnBackground"
|
||||
android:pathData="M256,746.15L213.85,704L437.85,480L213.85,256L256,213.85L480,437.85L704,213.85L746.15,256L522.15,480L746.15,704L704,746.15L480,522.15L256,746.15Z"/>
|
||||
</vector>
|
||||
Loaded 100 of 157 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user