Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
65c6ca77ed | ||
|
|
f02440348b | ||
|
|
1a80d00319 | ||
|
|
3f893fc580 | ||
|
|
225058f836 | ||
|
|
c23b92d386 | ||
|
|
41e5ab2349 | ||
|
|
580e79b03a | ||
|
|
301fab8024 | ||
|
|
281238a38e | ||
|
|
81fa259985 | ||
|
|
b2c6085933 | ||
|
|
caf3a0dd34 | ||
|
|
c4e10b9487 | ||
|
|
b05ee22c29 | ||
|
|
839433dbb1 | ||
|
|
153242ef66 | ||
|
|
05997eafe1 | ||
|
|
d6f4885b4a | ||
|
|
0b33c60a5a | ||
|
|
ad3a600e8c | ||
|
|
50dfb9be8b | ||
|
|
fafb996453 | ||
|
|
e1129bc009 | ||
|
|
5752e3285b | ||
|
|
a2ed78dfb8 | ||
|
|
0eadc3c3d5 | ||
|
|
6d0b24eb70 | ||
|
|
9da41e73aa | ||
|
|
01f28ecd4d | ||
|
|
2f3a331527 | ||
|
|
9496c3efbb | ||
|
|
93b833f7a9 | ||
|
|
3130be88be | ||
|
|
bb7b628d2f | ||
|
|
5f9ea732cf | ||
|
|
42f6bc17d3 | ||
|
|
1c6878c3fd | ||
|
|
b5beb7cc15 | ||
|
|
c6fb06ffe2 | ||
|
|
95d808dc75 | ||
|
|
b4135f9ec0 | ||
|
|
a62d748c72 | ||
|
|
ea0b1a7665 | ||
|
|
4cfc87a40b | ||
|
|
40a0d08a1f | ||
|
|
fd850651b3 | ||
|
|
ec633a7238 | ||
|
|
e10207959b | ||
|
|
c46ec70d97 | ||
|
|
871dfad6c4 | ||
|
|
676a0e2772 | ||
|
|
d9d22198d5 | ||
|
|
2dc3407217 | ||
|
|
d40f61928c | ||
|
|
19ff824591 | ||
|
|
ec7adbe331 | ||
|
|
af626f4dc0 | ||
|
|
acea8ba27d | ||
|
|
8f1849591d | ||
|
|
882207682f | ||
|
|
0be12e73a8 | ||
|
|
f0b4cc556e | ||
|
|
8c71dedd85 | ||
|
|
c1151b778c | ||
|
|
10e3093c53 | ||
|
|
9ef49e0226 | ||
|
|
a8ce70e6d9 | ||
|
|
2f9777f1f4 | ||
|
|
0a867051f2 | ||
|
|
673918771c | ||
|
|
df14850df1 | ||
|
|
28cae3fa19 | ||
|
|
c167d83940 | ||
|
|
722a3d8c7b | ||
|
|
d7f22c8e36 | ||
|
|
0da5e8a961 | ||
|
|
c45847ecd2 | ||
|
|
d6faf8ec16 | ||
|
|
3e21b0ea1c | ||
|
|
a8e15d8e18 | ||
|
|
50eeaa03bf | ||
|
|
f5b94e0f6a | ||
|
|
e9145d491c | ||
|
|
cb662fe1ff | ||
|
|
8ad3150f33 | ||
|
|
5cc718e35d | ||
|
|
0accd4fa79 | ||
|
|
5840c0126e | ||
|
|
017a2413b6 | ||
|
|
c53c4ed9a1 | ||
|
|
12ba9234a4 | ||
|
|
aaff0be438 | ||
|
|
11e32572ef | ||
|
|
ce3f9ebfd7 | ||
|
|
1b70b444f2 | ||
|
|
7214da80fa | ||
|
|
4e5aab276a | ||
|
|
4ab13508c4 | ||
|
|
df22a754b7 | ||
|
|
9efecab4b6 | ||
|
|
9aea4bb90e | ||
|
|
5c17f96d3d | ||
|
|
d47c6d0cc8 | ||
|
|
176160cd8f | ||
|
|
e6a4393b6d | ||
|
|
acc5b166d5 | ||
|
|
1d2f3345df | ||
|
|
b63e9a6747 | ||
|
|
1f8b56bc78 | ||
|
|
dc9a6bfd9b | ||
|
|
a825ad6a36 | ||
|
|
dd1be73904 | ||
|
|
7156bc417c | ||
|
|
d9c46898ab | ||
|
|
19ce9cbd7e | ||
|
|
584556faca | ||
|
|
028ca6303a | ||
|
|
76734de987 | ||
|
|
646a97e77b | ||
|
|
1aa41eb638 | ||
|
|
2a34100bf2 | ||
|
|
5d33d188bd | ||
|
|
8343ba9c2d | ||
|
|
95cbfdf42c | ||
|
|
7e72cbef54 | ||
|
|
a7642795ca | ||
|
|
f392991988 | ||
|
|
556c7d0841 | ||
|
|
d43bcf09b2 | ||
|
|
6120427400 | ||
|
|
2b087a4c45 | ||
|
|
457e58264b | ||
|
|
4d5d02c794 | ||
|
|
b8f3b016b7 | ||
|
|
b6307f67ce | ||
|
|
1e8dec3021 | ||
|
|
86d290b217 | ||
|
|
02d26f864d | ||
|
|
5aa6c975da | ||
|
|
7075fc710d | ||
|
|
ba0cb871a4 | ||
|
|
95a2a44cb1 | ||
|
|
fd65b17921 | ||
|
|
a3f469b466 | ||
|
|
e86129295a | ||
|
|
f4c46fbd5d | ||
|
|
439b76f8bf | ||
|
|
ffd455c6d8 | ||
|
|
29c3fddd14 | ||
|
|
516a55e4e0 | ||
|
|
68e4d0639a | ||
|
|
db26e639e6 | ||
|
|
32cd27997c | ||
|
|
6fb8091754 | ||
|
|
0d7d47ea10 | ||
|
|
3d544fa423 | ||
|
|
487451712e | ||
|
|
e78718ab79 | ||
|
|
35c58e14ad | ||
|
|
4efad853f7 | ||
|
|
6c22050906 | ||
|
|
17dc90162b | ||
|
|
72933fd45b | ||
|
|
c8c0e37052 | ||
|
|
7b6d8e3a18 | ||
|
|
6167c412c7 | ||
|
|
226f09f8bb | ||
|
|
0c4ba99a07 | ||
|
|
097adebd9b | ||
|
|
03a75a5b29 | ||
|
|
0c6e2b1a98 | ||
|
|
a7b92120ba | ||
|
|
3f78dccf3b | ||
|
|
c6ddd6fd03 | ||
|
|
eab00983a8 | ||
|
|
038c526652 | ||
|
|
704c128801 | ||
|
|
209eab0755 | ||
|
|
65d48d03fd | ||
|
|
dcd5f1b650 | ||
|
|
a74eb821f8 | ||
|
|
738d8a055c | ||
|
|
2e5559df88 | ||
|
|
dc1cc429e9 | ||
|
|
339566b243 | ||
|
|
0e1d4703e5 | ||
|
|
bcaa0e5c5c | ||
|
|
cbc1d139af | ||
|
|
ef48223d46 | ||
|
|
81ba96a3d0 | ||
|
|
80104a2285 | ||
|
|
b9973b845f | ||
|
|
a325ace6f3 | ||
|
|
7a2beececc | ||
|
|
4b5ce622fd | ||
|
|
5d8b9f338d | ||
|
|
9d2e5dd217 | ||
|
|
9ad6a6291d | ||
|
|
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 | ||
|
|
efa3134dc6 | ||
|
|
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 | ||
|
|
acb039ee23 | ||
|
|
59e32fe696 | ||
|
|
7965ce90a6 | ||
|
|
142ca57f76 | ||
|
|
15beb0af57 | ||
|
|
14e7fbd127 | ||
|
|
144ff7dfd2 | ||
|
|
d030847992 | ||
|
|
eb1ad1f4af | ||
|
|
fc048c9bd6 | ||
|
|
c7a387df3d | ||
|
|
732f047ff7 | ||
|
|
bbeba2b733 | ||
|
|
83d2d0af02 | ||
|
|
3518464716 | ||
|
|
f9247e9114 | ||
|
|
be610059cf | ||
|
|
b12c689d4e | ||
|
|
55ae0b541a | ||
|
|
f74abd11fc | ||
|
|
8817c62ed3 | ||
|
|
d5616d63b6 | ||
|
|
9cbf6f9d56 | ||
|
|
ad66688bf9 | ||
|
|
b5281443bf | ||
|
|
c616edf9f7 | ||
|
|
aa4f8360dc | ||
|
|
99dea6d6f6 | ||
|
|
b3dcaefede | ||
|
|
9ec45096ba | ||
|
|
a3edcf845a | ||
|
|
48de3f9a8d | ||
|
|
979a3f8ee7 | ||
|
|
9c79e02cc8 | ||
|
|
3db91fb937 | ||
|
|
e9f2a6b711 | ||
|
|
955c0122cf | ||
|
|
d5f3d36d23 | ||
|
|
2c74fa3339 | ||
|
|
e3220910f5 | ||
|
|
8e97dd6972 | ||
|
|
0bf6b3fa1a | ||
|
|
6ac0599f4c | ||
|
|
f14b9accee | ||
|
|
da2ff27391 | ||
|
|
60d13ac9a9 | ||
|
|
011cac925a | ||
|
|
4d0412e5bd | ||
|
|
be30ce2c62 | ||
|
|
3c6541607c | ||
|
|
be80e42dc5 | ||
|
|
031a1d2810 | ||
|
|
ccbbb45f39 | ||
|
|
13b53c62ec | ||
|
|
8c83c7adcf | ||
|
|
5617dacfe7 | ||
|
|
ed9e20ede3 | ||
|
|
b7f91b593e | ||
|
|
4a39c5c525 | ||
|
|
fc716df189 | ||
|
|
9d108212dd | ||
|
|
e34dd65dda | ||
|
|
3386418abd | ||
|
|
c8b99e10e8 | ||
|
|
d8f8b87c54 | ||
|
|
31d3b975ea | ||
|
|
fb5de4f12a | ||
|
|
b02c0a421c | ||
|
|
2843ed749d | ||
|
|
9722a3d9b7 | ||
|
|
0d21f7a783 | ||
|
|
a5efab5838 | ||
|
|
f186064f6e | ||
|
|
866b8270fe | ||
|
|
e0af9381cb | ||
|
|
e70f930929 | ||
|
|
2364a32de9 | ||
|
|
c8c0c2f42c | ||
|
|
e87056a12f | ||
|
|
cfd3153620 | ||
|
|
78c11ee41e | ||
|
|
bed4011b40 | ||
|
|
6a326072d4 | ||
|
|
59a35cbb4a | ||
|
|
a78e60416d | ||
|
|
ac2001142f | ||
|
|
6d71322982 | ||
|
|
3bf14799b5 | ||
|
|
aaf4264f44 | ||
|
|
b097e8070a | ||
|
|
99ad244376 | ||
|
|
99817d3e33 | ||
|
|
ac5a950ce3 | ||
|
|
5a92c210f7 | ||
|
|
20aab465a8 | ||
|
|
8c8ee9bd9c | ||
|
|
5f116189e1 | ||
|
|
6da0732642 | ||
|
|
839cb6b058 | ||
|
|
a44bdd317d | ||
|
|
4b2de05e5c | ||
|
|
8e34ba7939 | ||
|
|
c5081f73be | ||
|
|
470d3cca27 | ||
|
|
7df53d9f40 | ||
|
|
051a6e582f | ||
|
|
989dc094fa | ||
|
|
0820496c45 | ||
|
|
5898aa791c | ||
|
|
10c29cee6e | ||
|
|
e25fb9a48e | ||
|
|
432d93aaa2 | ||
|
|
043ccbe6c2 | ||
|
|
e230b27e5b | ||
|
|
10c1e99335 | ||
|
|
ce83c46cba | ||
|
|
54ed1ccb80 | ||
|
|
71b0a6783a | ||
|
|
9fe216036b | ||
|
|
24c24bbffe | ||
|
|
b05232a05f | ||
|
|
da193440f2 | ||
|
|
08fb9d79f0 | ||
|
|
3fcc34436b | ||
|
|
720139660a | ||
|
|
d58dde5a95 | ||
|
|
79784787ee | ||
|
|
28fa96e153 | ||
|
|
1c1e037557 | ||
|
|
ee805d0447 | ||
|
|
c36fd98110 | ||
|
|
cb6b329ce1 | ||
|
|
733a30f310 | ||
|
|
e6aece5a05 | ||
|
|
5a158d3b61 | ||
|
|
f968f8e88a | ||
|
|
996630d0dd | ||
|
|
6a79dbdaec | ||
|
|
0c2972cf95 | ||
|
|
6945b7cd32 | ||
|
|
8dfde3332b | ||
|
|
ced5129263 | ||
|
|
eb1e6f23b0 | ||
|
|
13496ba454 | ||
|
|
d714aef47f | ||
|
|
56eecb45e4 | ||
|
|
1a332ce707 | ||
|
|
802a0b617d | ||
|
|
85206956e7 | ||
|
|
37bc68fef9 | ||
|
|
24632351ed | ||
|
|
c9dbefbe38 | ||
|
|
4fb93c41e8 | ||
|
|
81053009e0 | ||
|
|
8f4ffb4731 | ||
|
|
cb187fc7ed | ||
|
|
41c90f5467 | ||
|
|
4eef590bcf | ||
|
|
389e60b284 | ||
|
|
81afba02a0 | ||
|
|
0718e15ec9 | ||
|
|
07a3103a84 | ||
|
|
d3bab9b062 | ||
|
|
6040411c4f | ||
|
|
443310b3e5 | ||
|
|
38b149cbfc | ||
|
|
4664817d76 | ||
|
|
903bf9e3bb | ||
|
|
33dd27bb3d | ||
|
|
93971a097a | ||
|
|
820cf6ea87 | ||
|
|
42177d9251 | ||
|
|
03fd6b10b8 | ||
|
|
4836460f65 | ||
|
|
67cdd63ad4 | ||
|
|
5d866d8513 | ||
|
|
e8dc956b7d | ||
|
|
4c20c7411b | ||
|
|
af3273f9c6 | ||
|
|
3760588796 | ||
|
|
ed6e9bd469 | ||
|
|
e2a6cb02d7 | ||
|
|
6c32823a75 | ||
|
|
e867a09e25 | ||
|
|
7b4757491c | ||
|
|
c5c1768083 | ||
|
|
78cfe50597 | ||
|
|
99f4fa65ad | ||
|
|
739e0392b6 | ||
|
|
ffe823698c | ||
|
|
eff8e2037a | ||
|
|
06a78ebee0 | ||
|
|
24abd02472 | ||
|
|
a459a93d11 | ||
|
|
3d473ae5c4 | ||
|
|
bf965e8fd4 | ||
|
|
9bc6a144ec | ||
|
|
7f79248c50 | ||
|
|
c0f4b8bce7 | ||
|
|
47a38471c7 | ||
|
|
f1bef54bb4 | ||
|
|
fe56913df0 | ||
|
|
7bc5138208 | ||
|
|
637d77f95b | ||
|
|
cfeb51b422 | ||
|
|
4ae3a20b40 | ||
|
|
50881a3b2a | ||
|
|
c443093924 | ||
|
|
e74921acda | ||
|
|
e5f0402079 | ||
|
|
326d7495ac | ||
|
|
b099ec1a41 | ||
|
|
a589a2ad3f | ||
|
|
2b640f994d | ||
|
|
c3d06c4d1f | ||
|
|
a0ce6bf7f2 | ||
|
|
efa377409d | ||
|
|
65c6264428 | ||
|
|
077a8bc4d9 | ||
|
|
ad1467878f | ||
|
|
adc76d7213 | ||
|
|
a9c6086f2b | ||
|
|
3ca9cf0b62 | ||
|
|
4e287d02f9 | ||
|
|
7eeed348ca | ||
|
|
c968100b9d | ||
|
|
1b6df08df8 | ||
|
|
975b3abd98 | ||
|
|
14ba4f0c93 | ||
|
|
e3ebe25cdd | ||
|
|
c36246bded | ||
|
|
d30d6ef519 | ||
|
|
78b6c58dcd | ||
|
|
232ca60238 | ||
|
|
021650f064 | ||
|
|
1cf28d5997 | ||
|
|
334954b6a8 | ||
|
|
0fc5c13427 | ||
|
|
66f79842b7 | ||
|
|
094eed8bb3 | ||
|
|
06f746d7b0 | ||
|
|
95456166c2 | ||
|
|
206173e73a | ||
|
|
a683815540 | ||
|
|
93abec047d | ||
|
|
82732d4c35 | ||
|
|
137316d95b | ||
|
|
92ec3d31f4 | ||
|
|
b7fd424f33 | ||
|
|
ea923aa884 | ||
|
|
493cd5050d | ||
|
|
e3421d6ce4 | ||
|
|
84ac06d5df | ||
|
|
b7e29233cd | ||
|
|
17c7b5b675 | ||
|
|
f8a1aa1e77 | ||
|
|
ac011bf2d1 | ||
|
|
0e42001287 | ||
|
|
c5ba8e8fee | ||
|
|
26c8c2c6ad | ||
|
|
239ae81c78 | ||
|
|
4366723b21 | ||
|
|
e1190449c6 | ||
|
|
f5cff1c43b | ||
|
|
faf4f9bc1f | ||
|
|
605bdf5d9b | ||
|
|
2a60f884cf | ||
|
|
579cd86dab | ||
|
|
5d8b132956 | ||
|
|
10b3b514d0 | ||
|
|
16ec2b886d | ||
|
|
f406e2a258 | ||
|
|
6051271c81 | ||
|
|
7cced5a4b1 | ||
|
|
b4ba9308d2 | ||
|
|
2ada626c04 | ||
|
|
c9a7b79b50 | ||
|
|
88a64ce43d | ||
|
|
4e089c5405 | ||
|
|
30cd6b94f0 | ||
|
|
365cf562cb | ||
|
|
2078698bfa | ||
|
|
80e9274cf6 | ||
|
|
86b9e3ff3e | ||
|
|
ecead0465d | ||
|
|
e8aab5e730 | ||
|
|
0f8cf3dca0 | ||
|
|
8f1b47d4c4 | ||
|
|
76c0fc1fe7 | ||
|
|
2ff657c59d | ||
|
|
1216d9a3b7 | ||
|
|
f0ab914ca5 | ||
|
|
12537b3506 | ||
|
|
5f6d4df5b2 | ||
|
|
95dafdebe5 | ||
|
|
d23e8510db | ||
|
|
42a541e5dc | ||
|
|
7daac01c58 | ||
|
|
25827d0e9d | ||
|
|
b9fef9ad73 | ||
|
|
c33348d5fd | ||
|
|
2b3b738d3c | ||
|
|
3d7fbf8a95 | ||
|
|
132991122f | ||
|
|
43b0dd4eed | ||
|
|
c3b53776e4 | ||
|
|
79dfc5b5ba | ||
|
|
55f51cef47 | ||
|
|
d1402ad91b | ||
|
|
f6e6b91213 | ||
|
|
81dc92f449 | ||
|
|
5fd3a88b38 | ||
|
|
3bab78883b | ||
|
|
ac3523780f | ||
|
|
87850eb899 | ||
|
|
698a191586 | ||
|
|
c35bf9cabd | ||
|
|
8c21d0db04 | ||
|
|
c875ba5e54 | ||
|
|
c297fb043a | ||
|
|
bd97508a3e | ||
|
|
07a489b151 | ||
|
|
c59871300a | ||
|
|
173e91f461 | ||
|
|
12cba0242b | ||
|
|
4ed88e8fac | ||
|
|
1d9de332db | ||
|
|
72163182a0 | ||
|
|
801d7e0737 | ||
|
|
58b87f879a | ||
|
|
e518eaf742 | ||
|
|
e3346dd605 | ||
|
|
ca3cd2b12c | ||
|
|
af25a502dc | ||
|
|
b731e566e7 | ||
|
|
2f29f5bf85 | ||
|
|
6660469b43 | ||
|
|
992caa4088 | ||
|
|
31e1f23475 | ||
|
|
5b5f4b16ad | ||
|
|
dbb338ce63 | ||
|
|
1d33ded518 | ||
|
|
fe17397b38 | ||
|
|
db2cac5c62 | ||
|
|
aeec6c60b2 | ||
|
|
243720ee96 | ||
|
|
ec81dfd525 | ||
|
|
39e22de1a2 | ||
|
|
b7f7183094 | ||
|
|
911465a7ac | ||
|
|
82ed7c7111 | ||
|
|
636affe312 | ||
|
|
54aed8ec6b | ||
|
|
1d36a09731 | ||
|
|
c3eb16af85 | ||
|
|
efb4a9f8a2 | ||
|
|
31799218a9 | ||
|
|
423993b53e | ||
|
|
b2410b2625 | ||
|
|
d47832ac82 | ||
|
|
d61104d1ab | ||
|
|
00983d49cd | ||
|
|
cd77da18a0 | ||
|
|
f45900b464 | ||
|
|
cda0974d99 | ||
|
|
c1ce3e0625 | ||
|
|
de1977e1ff | ||
|
|
ec08358fcc | ||
|
|
d40a630487 | ||
|
|
f28e506060 | ||
|
|
957ad6aacb | ||
|
|
8196e9afcb | ||
|
|
2cd506d062 | ||
|
|
1627e05fa5 | ||
|
|
028a00bde6 | ||
|
|
fe843e0429 | ||
|
|
d575dcdb10 | ||
|
|
8a1314446d | ||
|
|
ca82fe5e55 | ||
|
|
374986816f | ||
|
|
5f731268b5 | ||
|
|
878480097a | ||
|
|
e033eb754d | ||
|
|
9c30879084 | ||
|
|
36b0884481 | ||
|
|
0a9054deac | ||
|
|
489ed3c4f8 | ||
|
|
d28f03573d | ||
|
|
5b9b9b5580 | ||
|
|
cb2ad03a80 | ||
|
|
4dc68854d3 | ||
|
|
c12319e103 | ||
|
|
5101bb05dc | ||
|
|
ab709a0273 | ||
|
|
ceebd341b1 | ||
|
|
cba87159ab | ||
|
|
1e3565405e | ||
|
|
24433528dc | ||
|
|
1e0a9f47b6 | ||
|
|
2cf3898f65 | ||
|
|
960f159a31 | ||
|
|
922168c86b | ||
|
|
779a07ff26 | ||
|
|
21b0212de7 | ||
|
|
0c504da18c | ||
|
|
12d2a3c935 | ||
|
|
5262253624 | ||
|
|
6f962feef7 | ||
|
|
bacab14be6 | ||
|
|
e0a786764e | ||
|
|
17bf162341 | ||
|
|
0540f775d3 | ||
|
|
2b04432a37 | ||
|
|
0a4dbbabd9 | ||
|
|
2f004502a1 | ||
|
|
8b0a7232cc | ||
|
|
fc4db3f86a | ||
|
|
58b7b274b8 | ||
|
|
d4f1d76763 | ||
|
|
250101c00a | ||
|
|
9270662842 | ||
|
|
d212e8d893 | ||
|
|
510d31544f | ||
|
|
e50a3bb8ce | ||
|
|
e626829b5c | ||
|
|
2ab8999638 | ||
|
|
8f118b7067 | ||
|
|
8a0b6bd3db | ||
|
|
bd17bf5f80 | ||
|
|
080f11c3e7 | ||
|
|
117ed40796 | ||
|
|
2188e55c5f | ||
|
|
49cc132f14 | ||
|
|
4296ed6209 | ||
|
|
8663b86fc6 | ||
|
|
c46ffd8454 | ||
|
|
cde4867b7e | ||
|
|
fdb2d535cd | ||
|
|
6e8ad7f9fc | ||
|
|
0613c8284a | ||
|
|
08fafcfced | ||
|
|
b463b61fd4 | ||
|
|
6e069a1579 | ||
|
|
17cb6af538 | ||
|
|
6c1bd61240 | ||
|
|
52049d599a | ||
|
|
57184a2c8b | ||
|
|
c767f65683 | ||
|
|
2155edd15f | ||
|
|
2b97ecf1fd | ||
|
|
6f3639702a | ||
|
|
62247033e9 | ||
|
|
ee448ad2e5 | ||
|
|
6069d1eb1c | ||
|
|
9c1aeb0dbf | ||
|
|
b9ae72aedd | ||
|
|
5180a51c74 | ||
|
|
082166cc5d | ||
|
|
94e0ff7eed | ||
|
|
5cf403a124 | ||
|
|
8a789ffe7d | ||
|
|
26df200fe4 | ||
|
|
e19bfb7f09 | ||
|
|
2502cf64ec | ||
|
|
2ccc576c69 | ||
|
|
b4ee93cd5c | ||
|
|
6cadc2d75b | ||
|
|
7b8e7a3e48 | ||
|
|
be5d7f7214 | ||
|
|
970fbdc270 | ||
|
|
ec3618deb3 | ||
|
|
4eb5b3ad08 | ||
|
|
7124d089a7 | ||
|
|
e108cd7834 | ||
|
|
90362ad0f4 | ||
|
|
e05de15865 | ||
|
|
8d86197270 | ||
|
|
984b82d4a1 | ||
|
|
7c3588275c | ||
|
|
02ab3467ed | ||
|
|
7c1ab534d8 | ||
|
|
3394148c93 | ||
|
|
c8cec5d002 | ||
|
|
ad982378ed | ||
|
|
4f50861280 | ||
|
|
f8c4ee9e6c | ||
|
|
cbe5d1069a | ||
|
|
d222d77a91 | ||
|
|
0804bfb8f6 | ||
|
|
b49dda2e18 | ||
|
|
daef06810b | ||
|
|
6786fbf569 | ||
|
|
df0386e349 | ||
|
|
e9689bb99a | ||
|
|
22d92f87ce | ||
|
|
ab4a88e4bd | ||
|
|
6983353912 | ||
|
|
d561bf2ea6 | ||
|
|
c4427313b0 | ||
|
|
4df58a5af9 | ||
|
|
7e262b6b57 | ||
|
|
20575e115c | ||
|
|
a0a730a6a9 | ||
|
|
0e1a2c78a2 | ||
|
|
6b1c41bd30 | ||
|
|
73a1373908 | ||
|
|
e5bfd5142b | ||
|
|
57c93abeef | ||
|
|
661da2f5ee | ||
|
|
a2c4710654 | ||
|
|
70a7ca5d08 | ||
|
|
28956b24da | ||
|
|
c782960949 | ||
|
|
31fcdd788a | ||
|
|
ef6431afbc | ||
|
|
5b227ee089 | ||
|
|
8de21d751e | ||
|
|
eb79cffb34 | ||
|
|
2c1f1c6828 | ||
|
|
c9f3510745 | ||
|
|
309b425e2c | ||
|
|
7add8bcc39 | ||
|
|
c5db820e1d | ||
|
|
119140a6bc | ||
|
|
6bc741d0b0 | ||
|
|
1682e06d24 | ||
|
|
729600917c | ||
|
|
141bddd504 | ||
|
|
ee53b48d96 | ||
|
|
7ec0492c0c | ||
|
|
5f35de732d | ||
|
|
bb667a3d37 | ||
|
|
82fcf044cf | ||
|
|
065d3594ac | ||
|
|
5aed05adc4 | ||
|
|
8f7a420ae3 | ||
|
|
29641c370e | ||
|
|
efb2484569 | ||
|
|
4c958bb333 | ||
|
|
6ca1fd6097 | ||
|
|
52087c3b9e | ||
|
|
5c22b2731b | ||
|
|
63f4a8229a | ||
|
|
08149e9e7e | ||
|
|
6fb08cfa99 | ||
|
|
a28feee4dc | ||
|
|
a3923f7a3a | ||
|
|
d7f73d9207 | ||
|
|
c182c97390 | ||
|
|
64e85478bd | ||
|
|
0402909473 | ||
|
|
6d40e00126 | ||
|
|
85282a2a34 | ||
|
|
14a8b1a66d | ||
|
|
e9f03ed115 | ||
|
|
1a86849463 | ||
|
|
9dac625117 | ||
|
|
4099e233d1 | ||
|
|
d68f9942eb | ||
|
|
d57fa48058 | ||
|
|
07b6434689 | ||
|
|
1566807d4d | ||
|
|
f4eee6f58e | ||
|
|
dc05e809f5 | ||
|
|
7d158bf3e2 | ||
|
|
7d460a6069 | ||
|
|
c6056dd033 | ||
|
|
29a77307a1 | ||
|
|
6839e60ff9 | ||
|
|
0473c5abc2 | ||
|
|
504e0a76d5 | ||
|
|
538e6ed98d | ||
|
|
516ca15abd | ||
|
|
c5485d0e4d | ||
|
|
7a3c6daf3d | ||
|
|
00aa51e082 | ||
|
|
d36195c89b | ||
|
|
28d2eaa527 | ||
|
|
f6b57a4b09 | ||
|
|
386877e91e | ||
|
|
5a0c43b7fe | ||
|
|
dbc22e7d87 | ||
|
|
9685f05c53 | ||
|
|
6fb9d77f70 | ||
|
|
4c4664f4f6 | ||
|
|
bbb7c38416 | ||
|
|
701bb898c5 | ||
|
|
1fa625e948 | ||
|
|
d4e429fdca | ||
|
|
3dc1e2d4ee | ||
|
|
9e8b222181 | ||
|
|
3d22d68548 | ||
|
|
afe92c04e0 | ||
|
|
d6d4998f3a | ||
|
|
f77e19556a | ||
|
|
fd04610e6c | ||
|
|
cb687d51e4 | ||
|
|
e37328e1f5 | ||
|
|
d10990e337 | ||
|
|
d9d0e1ff63 | ||
|
|
5c3c66ec6e | ||
|
|
e62614cb18 | ||
|
|
4615418e38 | ||
|
|
5ed74d18d8 | ||
|
|
586e6972a1 | ||
|
|
f1090e046d | ||
|
|
32a8d308a1 | ||
|
|
7ba7cc77bf | ||
|
|
4ef8d8c7ef | ||
|
|
6a43b55809 | ||
|
|
323f29f4a7 | ||
|
|
825d285361 | ||
|
|
b98c08ef16 | ||
|
|
03ec846b96 | ||
|
|
c9b8a880f3 | ||
|
|
efac779874 | ||
|
|
031c755e1d | ||
|
|
35a0e68e2d | ||
|
|
cd537649a0 | ||
|
|
d1e3255219 | ||
|
|
0c215013f3 | ||
|
|
5c8fe0998c | ||
|
|
08361e5d4d | ||
|
|
12b053f2c1 | ||
|
|
557bc63f95 | ||
|
|
085e52d4b6 | ||
|
|
24332576e2 | ||
|
|
15ee6f344f | ||
|
|
c2eec8064b | ||
|
|
6e3434b7f1 | ||
|
|
c59fdcf696 | ||
|
|
17cc72bd36 | ||
|
|
03877e3e2d | ||
|
|
6d3d9f001e | ||
|
|
4462ced6ae | ||
|
|
bc0370303f | ||
|
|
7bcc4dbbad | ||
|
|
7e2f97d900 | ||
|
|
ce757da3c0 | ||
|
|
6373bd1f47 | ||
|
|
d1373eab9e | ||
|
|
7b4304224b | ||
|
|
f3cb02b6b2 | ||
|
|
65c1996c47 | ||
|
|
7d5a2316b0 | ||
|
|
5fd3cde33f | ||
|
|
8fd1e85bcf | ||
|
|
68a8e75946 | ||
|
|
2d44b20352 | ||
|
|
e3faadef3b | ||
|
|
944935faba | ||
|
|
b879f2d98e | ||
|
|
afdb560ccb | ||
|
|
3f1654f76b | ||
|
|
4ff9c63876 | ||
|
|
2190a320e1 | ||
|
|
348a918ab9 | ||
|
|
4b608d986e | ||
|
|
ab2dc8103e | ||
|
|
648535f17b | ||
|
|
1805d5fcf6 | ||
|
|
d4b847acc6 | ||
|
|
cae849f1c1 | ||
|
|
44232ef93f | ||
|
|
3e81fab284 | ||
|
|
108bee3010 | ||
|
|
3457475c51 | ||
|
|
9524b305c6 | ||
|
|
7bb5d5ddfc | ||
|
|
ff0b272fa4 | ||
|
|
5eb9af56c2 | ||
|
|
b49a002896 | ||
|
|
c9efb8b93b | ||
|
|
40ff40b25d | ||
|
|
bd6e6f6140 | ||
|
|
d55544e2df | ||
|
|
d2a7e82f44 | ||
|
|
afb458daf6 | ||
|
|
78bba740c2 | ||
|
|
c434e15c06 | ||
|
|
4250351f5b | ||
|
|
2b3fb068df | ||
|
|
bf3a0c4fb8 | ||
|
|
a0e5e77dcb | ||
|
|
f9f537b56a | ||
|
|
5de7b09967 | ||
|
|
b2b2f3095f | ||
|
|
23f6f90b56 | ||
|
|
474ed831c0 | ||
|
|
b10736804b | ||
|
|
6bce5197b0 | ||
|
|
bd5e1d53d6 | ||
|
|
fa75037ab3 | ||
|
|
34d12ee6d8 | ||
|
|
a050e7c411 | ||
|
|
c00177394d | ||
|
|
a0ac0d9348 |
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の概要 -->
|
||||||
|
|
||||||
|
# 詳細
|
||||||
|
<!-- 改善内容の詳細 -->
|
||||||
|
|
||||||
|
# 影響箇所
|
||||||
|
<!-- 予想される影響箇所(省略可) -->
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
name: 新機能用テンプレート
|
||||||
|
about: 新規能用テンプレート
|
||||||
|
title: ''
|
||||||
|
labels: 新機能
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
# 概要
|
||||||
|
<!-- Issueの概要 -->
|
||||||
|
|
||||||
|
# 詳細
|
||||||
|
<!-- 機能の詳細 -->
|
||||||
|
|
||||||
|
# 関連Issue
|
||||||
|
<!-- 関連するIssueがあれば -->
|
||||||
|
|
||||||
|
# 影響箇所
|
||||||
|
<!-- 予想される影響箇所(省略可) -->
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# 概要
|
||||||
|
<!-- PRの概要 -->
|
||||||
|
|
||||||
|
# 関連Issue
|
||||||
|
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||||
|
|
||||||
|
# 詳細
|
||||||
|
<!-- 詳細 -->
|
||||||
|
|
||||||
|
# 影響箇所
|
||||||
|
<!-- 予想される影響箇所 -->
|
||||||
|
|
||||||
|
# チェック
|
||||||
|
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||||
|
- [ ] 機能として完成している
|
||||||
|
- [ ] WIP(Work in progress: 作業中)
|
||||||
|
- [ ] 正常にビルド/起動ができる
|
||||||
|
- [ ] 既存の機能を壊していない
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
*.iml
|
||||||
|
.gradle
|
||||||
|
/local.properties
|
||||||
|
/.idea/caches
|
||||||
|
/.idea/libraries
|
||||||
|
/.idea/modules.xml
|
||||||
|
/.idea/workspace.xml
|
||||||
|
/.idea/navEditor.xml
|
||||||
|
/.idea/assetWizardSettings.xml
|
||||||
|
.DS_Store
|
||||||
|
/build
|
||||||
|
/captures
|
||||||
|
.externalNativeBuild
|
||||||
|
.cxx
|
||||||
|
local.properties
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
Lacerta
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CompilerConfiguration">
|
||||||
|
<bytecodeTargetLevel target="17" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="deploymentTargetSelector">
|
||||||
|
<selectionStates>
|
||||||
|
<SelectionState runConfigName="app">
|
||||||
|
<option name="selectionMode" value="DROPDOWN" />
|
||||||
|
<DropdownSelection timestamp="2024-01-20T07:15:21.179573376Z">
|
||||||
|
<Target type="DEFAULT_BOOT">
|
||||||
|
<handle>
|
||||||
|
<DeviceId pluginId="LocalEmulator" identifier="path=/home/rca/.android/avd/Pixel_3a_API_34_extension_level_7_x86_64.avd" />
|
||||||
|
</handle>
|
||||||
|
</Target>
|
||||||
|
</DropdownSelection>
|
||||||
|
<DialogSelection />
|
||||||
|
</SelectionState>
|
||||||
|
</selectionStates>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||||
|
<component name="GradleSettings">
|
||||||
|
<option name="linkedExternalProjectsSettings">
|
||||||
|
<GradleProjectSettings>
|
||||||
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
|
<option name="gradleJvm" value="jbr-17" />
|
||||||
|
<option name="modules">
|
||||||
|
<set>
|
||||||
|
<option value="$PROJECT_DIR$" />
|
||||||
|
<option value="$PROJECT_DIR$/app" />
|
||||||
|
<option value="$PROJECT_DIR$/component" />
|
||||||
|
<option value="$PROJECT_DIR$/component/common" />
|
||||||
|
<option value="$PROJECT_DIR$/component/scanner" />
|
||||||
|
<option value="$PROJECT_DIR$/component/viewer" />
|
||||||
|
<option value="$PROJECT_DIR$/data" />
|
||||||
|
<option value="$PROJECT_DIR$/feature" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/common" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/debug" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/home" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/library" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/scan" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/search" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/setting" />
|
||||||
|
<option value="$PROJECT_DIR$/model" />
|
||||||
|
<option value="$PROJECT_DIR$/processor" />
|
||||||
|
<option value="$PROJECT_DIR$/shared" />
|
||||||
|
<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" />
|
||||||
|
</GradleProjectSettings>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectMigrations">
|
||||||
|
<option name="MigrateToGradleLocalJavaHome">
|
||||||
|
<set>
|
||||||
|
<option value="$PROJECT_DIR$" />
|
||||||
|
</set>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<project version="4">
|
||||||
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||||
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectType">
|
||||||
|
<option name="id" value="Android" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# 概要
|
||||||
|
<!-- PRの概要 -->
|
||||||
|
|
||||||
|
# 関連Issue
|
||||||
|
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||||
|
|
||||||
|
# 詳細
|
||||||
|
<!-- 詳細 -->
|
||||||
|
|
||||||
|
# 影響箇所
|
||||||
|
<!-- 予想される影響箇所 -->
|
||||||
|
|
||||||
|
# チェック
|
||||||
|
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||||
|
- [ ] 機能として完成している
|
||||||
|
- [ ] WIP(Work in progress: 作業中)
|
||||||
|
- [ ] 正常にビルド/起動ができる
|
||||||
|
- [ ] 既存の機能を壊していない
|
||||||
@@ -1,2 +1,55 @@
|
|||||||
# Lacerta
|
# Lacerta
|
||||||
WIP
|
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を付ける
|
||||||
|
- 全員が同じ`// TODO:`を使っていると検索がむずかしくなるため
|
||||||
|
- (例: `// TODO-rca:`)
|
||||||
|
### 推奨
|
||||||
|
- マジックナンバーは控える(必要な場合もあるので)
|
||||||
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
plugins {
|
||||||
|
id 'com.android.application'
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'one.nem.lacerta'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId "one.nem.lacerta"
|
||||||
|
minSdk 26
|
||||||
|
targetSdk 33
|
||||||
|
|
||||||
|
// ベータ, Internal, Release問わず毎回インクリメントする
|
||||||
|
// https://developer.android.com/studio/publish/versioning#versioningsettings
|
||||||
|
versionCode 1
|
||||||
|
versionName "0.1.0"
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
debug { // 開発メンバー用
|
||||||
|
debuggable true
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
|
||||||
|
matchingFallbacks = ['release']
|
||||||
|
}
|
||||||
|
internal_release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
|
||||||
|
matchingFallbacks = ['release']
|
||||||
|
}
|
||||||
|
beta_release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
|
||||||
|
matchingFallbacks = ['release']
|
||||||
|
}
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation libs.androidx.appcompat
|
||||||
|
implementation libs.com.google.android.material
|
||||||
|
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
|
||||||
|
|
||||||
|
// Navigation
|
||||||
|
implementation libs.navigation.fragment
|
||||||
|
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(':feature:setting') // 設定画面
|
||||||
|
|
||||||
|
implementation project(':data')
|
||||||
|
implementation project(':shared:ui')
|
||||||
|
|
||||||
|
implementation project(':model')
|
||||||
|
|
||||||
|
implementation project(':utils')
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("one.nem.lacerta", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<uses-feature
|
||||||
|
android:name="android.hardware.camera"
|
||||||
|
android:required="false" />
|
||||||
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
|
|
||||||
|
<queries>
|
||||||
|
<intent>
|
||||||
|
<action android:name="android.media.action.IMAGE_CAPTURE" />
|
||||||
|
</intent>
|
||||||
|
</queries>
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||||
|
android:fullBackupContent="@xml/backup_rules"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:name=".LacertaApplication"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/Theme.Lacerta"
|
||||||
|
tools:targetApi="31">
|
||||||
|
<activity
|
||||||
|
android:name=".MainActivity"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<provider
|
||||||
|
android:name="androidx.core.content.FileProvider"
|
||||||
|
android:authorities="one.nem.lacerta.provider"
|
||||||
|
android:exported="false"
|
||||||
|
android:grantUriPermissions="true">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
|
android:resource="@xml/file_paths" />
|
||||||
|
</provider>
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package one.nem.lacerta;
|
||||||
|
|
||||||
|
import android.app.Application;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.google.android.material.color.DynamicColors;
|
||||||
|
|
||||||
|
import dagger.hilt.android.HiltAndroidApp;
|
||||||
|
|
||||||
|
@HiltAndroidApp
|
||||||
|
public class LacertaApplication extends Application {
|
||||||
|
@Override
|
||||||
|
public void onCreate() {
|
||||||
|
super.onCreate();
|
||||||
|
|
||||||
|
if (DynamicColors.isDynamicColorAvailable()) {
|
||||||
|
Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
|
||||||
|
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||||
|
} else {
|
||||||
|
Log.d("DynamicColors", "DynamicColors is not available.");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
package one.nem.lacerta;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.navigation.NavController;
|
||||||
|
import androidx.navigation.fragment.NavHostFragment;
|
||||||
|
import androidx.navigation.ui.NavigationUI;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.FragmentNavigation;
|
||||||
|
import one.nem.lacerta.model.pref.FeatureSwitchOverride;
|
||||||
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
|
|
||||||
|
import com.google.android.material.appbar.AppBarLayout;
|
||||||
|
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||||
|
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.utils.repository.SharedPrefUtils;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class MainActivity extends AppCompatActivity implements FragmentNavigation {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
SharedPrefUtils sharedPrefUtils;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
|
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
||||||
|
|
||||||
|
// Initialize app
|
||||||
|
if (sharedPrefUtils.getIsFirstLaunch()) initializeApp();
|
||||||
|
|
||||||
|
// Init navigation
|
||||||
|
try {
|
||||||
|
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
||||||
|
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
||||||
|
assert navHostFragment != null;
|
||||||
|
NavController navController = navHostFragment.getNavController();
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply feature switch
|
||||||
|
applyFeatureSwitch(bottomNavigationView, FeatureSwitchOverride.ENABLE_SEARCH, FeatureSwitch.FeatureMaster.enableSearch, one.nem.lacerta.feature.search.R.id.feature_search_navigation);
|
||||||
|
applyFeatureSwitch(bottomNavigationView, FeatureSwitchOverride.ENABLE_DEBUG_MENU, FeatureSwitch.FeatureMaster.enableDebugMenu, one.nem.lacerta.feature.debug.R.id.feature_debug_navigation);
|
||||||
|
|
||||||
|
|
||||||
|
// Set navigation bar color
|
||||||
|
getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
|
||||||
|
|
||||||
|
// Set status bar color
|
||||||
|
getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
|
||||||
|
|
||||||
|
// Set app bar color
|
||||||
|
AppBarLayout appBarLayout = findViewById(R.id.app_bar_layout);
|
||||||
|
appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
|
||||||
|
@Override
|
||||||
|
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
|
||||||
|
if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
|
||||||
|
// Collapsed
|
||||||
|
getWindow().setStatusBarColor(ContextCompat.getColor(getApplicationContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
|
||||||
|
} else if (verticalOffset == 0) {
|
||||||
|
// Expanded
|
||||||
|
getWindow().setStatusBarColor(ContextCompat.getColor(getApplicationContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
|
||||||
|
} else {
|
||||||
|
// Somewhere in between
|
||||||
|
// Here you can add a color transition if you want
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||||
|
setSupportActionBar(toolbar);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Public
|
||||||
|
public void setActionBarTitle(String title) {
|
||||||
|
getSupportActionBar().setTitle(title);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setActionBarBackButton(boolean isEnabled) {
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(isEnabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initializeApp() {
|
||||||
|
Log.d("Init", "Initializing app");
|
||||||
|
// Set feature switch override to default value
|
||||||
|
sharedPrefUtils.setFeatureSwitchOverride(FeatureSwitchOverride.ENABLE_SEARCH, FeatureSwitch.FeatureMaster.enableSearch);
|
||||||
|
sharedPrefUtils.setFeatureSwitchOverride(FeatureSwitchOverride.ENABLE_DEBUG_MENU, FeatureSwitch.FeatureMaster.enableDebugMenu);
|
||||||
|
|
||||||
|
// Set isFirstLaunch to false
|
||||||
|
sharedPrefUtils.setIsFirstLaunch(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void applyFeatureSwitch(BottomNavigationView bottomNavigationView, FeatureSwitchOverride featureSwitchOverride, boolean defaultValue, int menuId) {
|
||||||
|
boolean isEnabled = FeatureSwitch.Meta.canOverrideSwitch ? sharedPrefUtils.getFeatureSwitchOverride(featureSwitchOverride) : defaultValue;
|
||||||
|
if (!isEnabled) bottomNavigationView.getMenu().removeItem(menuId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void navigateToFragment(Fragment fragment) {
|
||||||
|
getSupportFragmentManager().beginTransaction()
|
||||||
|
.replace(R.id.nav_host_fragment, fragment)
|
||||||
|
.addToBackStack(null)
|
||||||
|
.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,170 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<path
|
||||||
|
android:fillColor="#3DDC84"
|
||||||
|
android:pathData="M0,0h108v108h-108z" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M9,0L9,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,0L19,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M29,0L29,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M39,0L39,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M49,0L49,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M59,0L59,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M69,0L69,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M79,0L79,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M89,0L89,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M99,0L99,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,9L108,9"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,19L108,19"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,29L108,29"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,39L108,39"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,49L108,49"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,59L108,59"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,69L108,69"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,79L108,79"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,89L108,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,99L108,99"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,29L89,29"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,39L89,39"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,49L89,49"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,59L89,59"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,69L89,69"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,79L89,79"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M29,19L29,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M39,19L39,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M49,19L49,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M59,19L59,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M69,19L69,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M79,19L79,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:aapt="http://schemas.android.com/aapt"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
|
||||||
|
<aapt:attr name="android:fillColor">
|
||||||
|
<gradient
|
||||||
|
android:endX="85.84757"
|
||||||
|
android:endY="92.4963"
|
||||||
|
android:startX="42.9492"
|
||||||
|
android:startY="49.59793"
|
||||||
|
android:type="linear">
|
||||||
|
<item
|
||||||
|
android:color="#44000000"
|
||||||
|
android:offset="0.0" />
|
||||||
|
<item
|
||||||
|
android:color="#00000000"
|
||||||
|
android:offset="1.0" />
|
||||||
|
</gradient>
|
||||||
|
</aapt:attr>
|
||||||
|
</path>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFF"
|
||||||
|
android:fillType="nonZero"
|
||||||
|
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
|
||||||
|
android:strokeWidth="1"
|
||||||
|
android:strokeColor="#00000000" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/bottom_nav"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="HOGE" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.fragment.app.FragmentContainerView
|
||||||
|
|
||||||
|
android:id="@+id/nav_host_fragment"
|
||||||
|
android:name="androidx.navigation.fragment.NavHostFragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:defaultNavHost="true"
|
||||||
|
app:navGraph="@navigation/main_nav"
|
||||||
|
tools:layout="@layout/fragment_home_top"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||||
|
android:id="@+id/bottom_nav"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/colorSecondaryContainer"
|
||||||
|
app:itemIconTint="@color/colorOnSecondaryContainer"
|
||||||
|
app:itemTextColor="@color/colorOnSecondaryContainer"
|
||||||
|
app:itemActiveIndicatorStyle="@style/Lacerta.Custom.Indicator"
|
||||||
|
app:labelVisibilityMode="selected"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:menu="@menu/bottom_nav_menu" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@id/feature_home_navigation"
|
||||||
|
android:icon="@drawable/home_24px"
|
||||||
|
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="@string/library_title"/>
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@id/feature_debug_navigation"
|
||||||
|
android:icon="@drawable/developer_mode_24px"
|
||||||
|
android:title="@string/debug_menu_title" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@id/feature_setting_navigation"
|
||||||
|
android:icon="@drawable/settings_24px"
|
||||||
|
android:title="@string/setting_title"/>
|
||||||
|
|
||||||
|
</menu>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@drawable/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
</adaptive-icon>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@drawable/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
</adaptive-icon>
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 982 B |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 7.6 KiB |
@@ -0,0 +1,18 @@
|
|||||||
|
<?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"
|
||||||
|
android:id="@+id/app_main_nav"
|
||||||
|
app:startDestination="@id/feature_home_navigation">
|
||||||
|
|
||||||
|
<include app:graph="@navigation/feature_debug_navigation" />
|
||||||
|
|
||||||
|
<include app:graph="@navigation/feature_library_navigation" />
|
||||||
|
|
||||||
|
<include app:graph="@navigation/feature_home_navigation" />
|
||||||
|
|
||||||
|
<include app:graph="@navigation/feature_search_navigation" />
|
||||||
|
|
||||||
|
<include app:graph="@navigation/feature_setting_navigation" />
|
||||||
|
|
||||||
|
|
||||||
|
</navigation>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name">Lacerta</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
Sample backup rules file; uncomment and customize as necessary.
|
||||||
|
See https://developer.android.com/guide/topics/data/autobackup
|
||||||
|
for details.
|
||||||
|
Note: This file is ignored for devices older that API 31
|
||||||
|
See https://developer.android.com/about/versions/12/backup-restore
|
||||||
|
-->
|
||||||
|
<full-backup-content>
|
||||||
|
<!--
|
||||||
|
<include domain="sharedpref" path="."/>
|
||||||
|
<exclude domain="sharedpref" path="device.xml"/>
|
||||||
|
-->
|
||||||
|
</full-backup-content>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
Sample data extraction rules file; uncomment and customize as necessary.
|
||||||
|
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
|
||||||
|
for details.
|
||||||
|
-->
|
||||||
|
<data-extraction-rules>
|
||||||
|
<cloud-backup>
|
||||||
|
<!-- TODO: Use <include> and <exclude> to control what is backed up.
|
||||||
|
<include .../>
|
||||||
|
<exclude .../>
|
||||||
|
-->
|
||||||
|
</cloud-backup>
|
||||||
|
<!--
|
||||||
|
<device-transfer>
|
||||||
|
<include .../>
|
||||||
|
<exclude .../>
|
||||||
|
</device-transfer>
|
||||||
|
-->
|
||||||
|
</data-extraction-rules>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<paths>
|
||||||
|
<cache-path name="cache" path="." />
|
||||||
|
</paths>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package one.nem.lacerta;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
plugins {
|
||||||
|
id 'com.android.application' version '8.0.2' apply false
|
||||||
|
id 'com.google.dagger.hilt.android' version '2.44' apply false
|
||||||
|
id 'com.android.library' version '8.0.2' apply false
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
plugins {
|
||||||
|
alias(libs.plugins.com.android.library)
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'one.nem.lacerta.component.common'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
minSdk 26
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
consumerProguardFiles "consumer-rules.pro"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation libs.androidx.appcompat
|
||||||
|
implementation libs.com.google.android.material
|
||||||
|
testImplementation libs.junit
|
||||||
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
|
implementation project(':shared:ui')
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta.component.common;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("one.nem.lacerta.component.common.test", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package one.nem.lacerta.component.common;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
plugins {
|
||||||
|
alias(libs.plugins.com.android.library)
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'one.nem.lacerta.component.scanner'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
minSdk 26
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
consumerProguardFiles "consumer-rules.pro"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation libs.androidx.appcompat
|
||||||
|
implementation libs.com.google.android.material
|
||||||
|
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')
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("one.nem.lacerta.component.scanner.test", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +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>
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
public class CaptureResultAdapter extends RecyclerView.Adapter<CaptureResultAdapter.ViewHolder> {
|
||||||
|
private final ArrayList<CapturedData> results;
|
||||||
|
|
||||||
|
public CaptureResultAdapter(ArrayList<CapturedData> results) {
|
||||||
|
this.results = results;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CaptureResultAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||||
|
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_scanner_component_manager_stub, parent, false);
|
||||||
|
return new CaptureResultAdapter.ViewHolder(view);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(CaptureResultAdapter.ViewHolder holder, int position) {
|
||||||
|
CapturedData result = results.get(position);
|
||||||
|
holder.textViewPath.setText(result.getPath());
|
||||||
|
holder.textViewResolutionHeight.setText(result.getResolutionHeight());
|
||||||
|
holder.textViewResolutionWidth.setText(result.getResolutionWidth());
|
||||||
|
holder.imageView.setImageBitmap(result.getBitmap());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return results.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
|
public TextView textViewPath;
|
||||||
|
public TextView textViewResolutionHeight;
|
||||||
|
public TextView textViewResolutionWidth;
|
||||||
|
public ImageView imageView;
|
||||||
|
|
||||||
|
public ViewHolder(View view) {
|
||||||
|
super(view);
|
||||||
|
textViewPath = view.findViewById(R.id.textViewPath);
|
||||||
|
textViewResolutionHeight = view.findViewById(R.id.textViewResHeight);
|
||||||
|
textViewResolutionWidth = view.findViewById(R.id.textViewResWidth);
|
||||||
|
imageView = view.findViewById(R.id.imageViewResult);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
|
public class CapturedData {
|
||||||
|
|
||||||
|
private String path;
|
||||||
|
private String resolutionHeight;
|
||||||
|
private String resolutionWidth;
|
||||||
|
private String size;
|
||||||
|
private Bitmap bitmap;
|
||||||
|
|
||||||
|
// Constructor
|
||||||
|
|
||||||
|
public CapturedData(String path, String resolutionHeight, String resolutionWidth, String size, Bitmap bitmap) {
|
||||||
|
this.path = path;
|
||||||
|
this.resolutionHeight = resolutionHeight;
|
||||||
|
this.resolutionWidth = resolutionWidth;
|
||||||
|
this.size = size;
|
||||||
|
this.bitmap = bitmap;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Getters
|
||||||
|
|
||||||
|
public String getPath() {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getResolutionHeight() {
|
||||||
|
return resolutionHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getResolutionWidth() {
|
||||||
|
return resolutionWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSize() {
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Bitmap getBitmap() {
|
||||||
|
return bitmap;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,251 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.activity.result.ActivityResultLauncher;
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts;
|
||||||
|
import androidx.core.content.FileProvider;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import android.os.Environment;
|
||||||
|
import android.provider.MediaStore;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
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を使うようにする?
|
||||||
|
|
||||||
|
// Results
|
||||||
|
private ArrayList<CapturedData> results = new ArrayList<>();
|
||||||
|
|
||||||
|
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 -> {
|
||||||
|
if (result.getResultCode() == Activity.RESULT_OK) {
|
||||||
|
try {
|
||||||
|
if (getActivity() == null) {
|
||||||
|
Log.d("ScannerDataManagerStubFragment", "getActivity() is null");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (photoURI == null) {
|
||||||
|
Log.d("ScannerDataManagerStubFragment", "photoURI is null");
|
||||||
|
Toast.makeText(getActivity(), "photoURI is null", Toast.LENGTH_LONG).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Bitmap imageBitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), photoURI);
|
||||||
|
results.add(new CapturedData("Placeholder", Integer.toString(imageBitmap.getHeight()), Integer.toString(imageBitmap.getWidth()), "Placeholder", imageBitmap));
|
||||||
|
} catch (IOException e) {
|
||||||
|
Log.e("ScannerDataManagerStubFragment", "Error occurred while reading the file", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
public ScannerDataManagerStubFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
// TODO: Rename and change types and number of parameters
|
||||||
|
public static ScannerDataManagerStubFragment newInstance() {
|
||||||
|
ScannerDataManagerStubFragment fragment = new ScannerDataManagerStubFragment();
|
||||||
|
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
|
||||||
|
return inflater.inflate(R.layout.fragment_scanner_data_manager_stub, container, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
|
// view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
|
||||||
|
// Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
|
||||||
|
// Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||||
|
// if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
|
||||||
|
// File photoFile = null;
|
||||||
|
// try {
|
||||||
|
// String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
|
||||||
|
// String imageFileName = "JPEG_" + timeStamp + "_";
|
||||||
|
// File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
|
||||||
|
// photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
|
||||||
|
// } catch (IOException ex) {
|
||||||
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
|
||||||
|
// }
|
||||||
|
// if (photoFile != null) {
|
||||||
|
// photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
|
||||||
|
// takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
|
||||||
|
// cameraLauncher.launch(takePictureIntent);
|
||||||
|
// }
|
||||||
|
// else {
|
||||||
|
// Log.d("ScannerDataManagerStubFragment", "photoFile is null");
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// else {
|
||||||
|
// Log.d("ScannerDataManagerStubFragment", "camera not available");
|
||||||
|
// }
|
||||||
|
// updateResults();
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
|
||||||
|
// Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
|
||||||
|
// Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
|
||||||
|
//
|
||||||
|
// this.documentDetail = createSampleDocumentDetail();
|
||||||
|
//
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
|
||||||
|
// Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
|
||||||
|
// Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
|
||||||
|
// // TODO-rca: ここでDocumentProcessorを初期化する
|
||||||
|
// if (this.documentDetail == null) {
|
||||||
|
// Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
|
||||||
|
// Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
|
||||||
|
// try {
|
||||||
|
// this.documentProcessor.init();
|
||||||
|
// } catch (Exception e) {
|
||||||
|
// Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
|
||||||
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
|
||||||
|
// }
|
||||||
|
// Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
|
||||||
|
// Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
|
||||||
|
// Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
|
||||||
|
// if (this.documentProcessor == null) {
|
||||||
|
// Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// Bitmap[] bitmaps = new Bitmap[results.size()];
|
||||||
|
// for (int i = 0; i < results.size(); i++) {
|
||||||
|
// bitmaps[i] = results.get(i).getBitmap();
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// try {
|
||||||
|
// this.documentProcessor.addNewPagesToLast(bitmaps);
|
||||||
|
// } catch (Exception e) {
|
||||||
|
// Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
|
||||||
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
|
||||||
|
//
|
||||||
|
// try {
|
||||||
|
// this.documentProcessor.close();
|
||||||
|
// } catch (Exception e) {
|
||||||
|
// Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
|
||||||
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
Log.d("ScannerDataManagerStubFragment", "onResume");
|
||||||
|
updateResults();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateResults() {
|
||||||
|
Log.d("ScannerDataManagerStubFragment", "updateResults");
|
||||||
|
|
||||||
|
// TODO-rca: エラーハンドリング
|
||||||
|
RecyclerView recyclerView = getView().findViewById(R.id.result_recycler_view);
|
||||||
|
|
||||||
|
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
|
||||||
|
recyclerView.setAdapter(new CaptureResultAdapter(this.results));
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,220 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.app.ProgressDialog;
|
||||||
|
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 java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
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");
|
||||||
|
// Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
|
||||||
|
ProgressDialog dialog = new ProgressDialog(this);
|
||||||
|
dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
|
||||||
|
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
|
||||||
|
dialog.setCancelable(false);
|
||||||
|
dialog.show();
|
||||||
|
DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
|
||||||
|
document.createDocument(documentMeta).thenAccept((documentDetail) -> {
|
||||||
|
Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
|
||||||
|
croppedImages.toArray(bitmaps);
|
||||||
|
logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
|
||||||
|
addPagesToDocumentDetail(documentDetail, bitmaps).join();
|
||||||
|
document.updateDocument(documentDetail).join();
|
||||||
|
dialog.dismiss();
|
||||||
|
finish();
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps) {
|
||||||
|
return CompletableFuture.runAsync(() -> {
|
||||||
|
try {
|
||||||
|
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
|
||||||
|
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
|
||||||
|
} 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import com.websitebeaver.documentscanner.DocumentScanner;
|
||||||
|
import com.websitebeaver.documentscanner.DocumentScannerActivity;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class ScannerManagerFragment extends Fragment {
|
||||||
|
|
||||||
|
String TAG = getClass().getSimpleName();
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory vcsFactory;
|
||||||
|
|
||||||
|
private static final boolean DEFAULT_SINGLE_PAGE = false;
|
||||||
|
private boolean singlePage;
|
||||||
|
|
||||||
|
public ScannerManagerFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static ScannerManagerFragment newInstance(boolean singlePage) {
|
||||||
|
// ScannerManagerFragment fragment = new ScannerManagerFragment();
|
||||||
|
// Bundle args = new Bundle();
|
||||||
|
// args.putBoolean("singlePage", singlePage);
|
||||||
|
// fragment.setArguments(args);
|
||||||
|
// return fragment;
|
||||||
|
// }
|
||||||
|
|
||||||
|
public static ScannerManagerFragment newInstance() {
|
||||||
|
ScannerManagerFragment fragment = new ScannerManagerFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putBoolean("singlePage", DEFAULT_SINGLE_PAGE);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (getArguments() != null) {
|
||||||
|
singlePage = getArguments().getBoolean("singlePage", DEFAULT_SINGLE_PAGE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_scanner_manager, container, false);
|
||||||
|
|
||||||
|
// ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
|
||||||
|
// ViewGroup.LayoutParams.MATCH_PARENT,
|
||||||
|
// ViewGroup.LayoutParams.MATCH_PARENT
|
||||||
|
// );
|
||||||
|
// view.setLayoutParams(layoutParams);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
|
// Init
|
||||||
|
logger.debug(TAG, "called");
|
||||||
|
|
||||||
|
view.findViewById(R.id.button_intent_scanner_manager_activity).setOnClickListener(v -> {
|
||||||
|
// DocumentScannerActivityを起動する
|
||||||
|
Intent intent = new Intent(requireActivity().getApplicationContext(), ScannerManagerActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:state_selected="true">
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
<solid android:color="#00000000" />
|
||||||
|
<corners android:radius="8dp" />
|
||||||
|
<stroke android:color="#FF0000" android:width="2dp" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
<solid android:color="#00000000" />
|
||||||
|
<corners android:radius="8dp" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
</selector>
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:id="@+id/main"
|
||||||
|
android:theme="@style/Theme.Lacerta"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
|
android:id="@+id/top_toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/colorPrimaryContainer"
|
||||||
|
app:titleTextColor="@color/colorOnPrimaryContainer"
|
||||||
|
app:title="Preview"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
android:theme="?attr/actionBarTheme"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/selected_image"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_above="@+id/horizontal_scroll"
|
||||||
|
android:scaleType="centerInside"
|
||||||
|
app:layout_constraintBottom_toTopOf="@+id/horizontal_scroll"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/top_toolbar" />
|
||||||
|
|
||||||
|
<HorizontalScrollView
|
||||||
|
android:id="@+id/horizontal_scroll"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:scrollbars="none"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/selected_image">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/result_list_container"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</HorizontalScrollView>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
<?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=".ScannerDataManagerStubFragment" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
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"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/button_call_camera"
|
||||||
|
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="Call camera" />
|
||||||
|
|
||||||
|
</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"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
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,70 @@
|
|||||||
|
<?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="wrap_content"
|
||||||
|
android:layout_margin="24px">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageViewResult"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:srcCompat="@android:drawable/presence_video_online"
|
||||||
|
android:adjustViewBounds="true"/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/imageViewResult">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="2"
|
||||||
|
android:text="Resolution:"
|
||||||
|
android:textIsSelectable="false"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textViewResHeight"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="Height"
|
||||||
|
android:textIsSelectable="false"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textViewResWidth"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="Width"
|
||||||
|
android:textIsSelectable="false"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textViewPath"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="Path"
|
||||||
|
android:textIsSelectable="false"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</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>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
plugins {
|
||||||
|
alias(libs.plugins.com.android.library)
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'one.nem.lacerta.component.viewer'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
minSdk 26
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
consumerProguardFiles "consumer-rules.pro"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation libs.androidx.appcompat
|
||||||
|
implementation libs.com.google.android.material
|
||||||
|
implementation libs.androidx.activity
|
||||||
|
implementation libs.androidx.constraintlayout
|
||||||
|
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
|
||||||
|
|
||||||
|
// DI
|
||||||
|
implementation libs.com.google.dagger.hilt.android
|
||||||
|
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||||
|
|
||||||
|
// shared
|
||||||
|
implementation project(':shared:ui')
|
||||||
|
|
||||||
|
implementation project(':utils')
|
||||||
|
|
||||||
|
implementation project(':data')
|
||||||
|
|
||||||
|
implementation project(':model')
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("one.nem.lacerta.component.viewer.test", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<application>
|
||||||
|
<activity
|
||||||
|
android:name=".ViewerMainActivity"
|
||||||
|
android:exported="false" />
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.data.Document;
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link ComponentViewerTopFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class ComponentViewerTopFragment extends Fragment {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
Document document;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
private static final String TAG = "ComponentViewerTopFragment";
|
||||||
|
|
||||||
|
private String documentId;
|
||||||
|
|
||||||
|
public ComponentViewerTopFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ComponentViewerTopFragment newInstance(String documentId) {
|
||||||
|
ComponentViewerTopFragment fragment = new ComponentViewerTopFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString("documentId", documentId);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (getArguments() != null) {
|
||||||
|
documentId = getArguments().getString("documentId");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
|
||||||
|
Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
|
||||||
|
});
|
||||||
|
recyclerView.setAdapter(viewerBodyAdapter);
|
||||||
|
|
||||||
|
document.getDocument(documentId).thenAccept(documentDetail -> {
|
||||||
|
ArrayList<Page> pages = documentDetail.getPages();
|
||||||
|
logger.debug(TAG, "pages.size(): " + pages.size());
|
||||||
|
viewerBodyAdapter.setPages(pages);
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
public interface ItemClickListener {
|
||||||
|
void onItemClick(String fileName); // DEBUG
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.media.Image;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
|
||||||
|
public class ViewerBodyAdapter extends RecyclerView.Adapter<ViewerBodyAdapter.ViewHolder>{
|
||||||
|
|
||||||
|
ArrayList<Page> pages;
|
||||||
|
|
||||||
|
ItemClickListener listener;
|
||||||
|
|
||||||
|
public ViewerBodyAdapter(ArrayList<Page> pages, ItemClickListener listener){
|
||||||
|
this.pages = pages;
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ViewerBodyAdapter(ItemClickListener listener){
|
||||||
|
this.pages = new ArrayList<>();
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPages(ArrayList<Page> pages){
|
||||||
|
this.pages = pages;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public ViewerBodyAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
View view = View.inflate(parent.getContext(), R.layout.viewer_body_list_item, null);
|
||||||
|
return new ViewHolder(view);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull ViewerBodyAdapter.ViewHolder holder, int position) {
|
||||||
|
Bitmap bitmap = pages.get(position).getBitmap();
|
||||||
|
holder.image.setImageBitmap(bitmap);
|
||||||
|
holder.itemView.setOnClickListener(v -> {
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return pages.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
|
||||||
|
ImageView image;
|
||||||
|
|
||||||
|
public ViewHolder(@NonNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
image = itemView.findViewById(R.id.imageView);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.activity.EdgeToEdge;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.graphics.Insets;
|
||||||
|
import androidx.core.view.ViewCompat;
|
||||||
|
import androidx.core.view.WindowInsetsCompat;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.navigation.NavController;
|
||||||
|
import androidx.navigation.fragment.NavHostFragment;
|
||||||
|
import androidx.navigation.ui.NavigationUI;
|
||||||
|
|
||||||
|
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class ViewerMainActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public ViewerMainActivity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
// Variables
|
||||||
|
private static final String TAG = "ViewerMainActivity";
|
||||||
|
String documentId;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
EdgeToEdge.enable(this);
|
||||||
|
setContentView(R.layout.activity_viewer_main);
|
||||||
|
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;
|
||||||
|
});
|
||||||
|
|
||||||
|
Intent intent = getIntent();
|
||||||
|
try {
|
||||||
|
documentId = intent.getStringExtra("documentId");
|
||||||
|
}
|
||||||
|
catch (Exception e) {
|
||||||
|
logger.error(TAG, "Failed to get documentId from intent");
|
||||||
|
logger.error(TAG, "Searchable Error code: " + "f64c21a2-391f-4c40-92f6-183da459de21");
|
||||||
|
Toast.makeText(this, "Failed to get documentId from intent", Toast.LENGTH_LONG).show();
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
getSupportFragmentManager().beginTransaction()
|
||||||
|
.replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId))
|
||||||
|
.commitNow();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package one.nem.lacerta.component.viewer.model;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
|
public class ViewerBodyListItem {
|
||||||
|
|
||||||
|
Bitmap image;
|
||||||
|
|
||||||
|
public ViewerBodyListItem(Bitmap image) {
|
||||||
|
this.image = image;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Bitmap getImage() {
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setImage(Bitmap image) {
|
||||||
|
this.image = image;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?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:id="@+id/main"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".ViewerMainActivity">
|
||||||
|
|
||||||
|
<androidx.fragment.app.FragmentContainerView
|
||||||
|
android:id="@+id/nav_host_fragment"
|
||||||
|
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:defaultNavHost="true"
|
||||||
|
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,51 @@
|
|||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="Title" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/body_recycler_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_margin="16dp"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?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="wrap_content">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:elevation="8dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:srcCompat="@tools:sample/backgrounds/scenic" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<?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"
|
||||||
|
android:id="@+id/component_viewer_navigation"
|
||||||
|
app:startDestination="@id/componentViewerTopFragment">
|
||||||
|
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/componentViewerTopFragment"
|
||||||
|
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
|
||||||
|
android:label="ComponentViewerTopFragment" />
|
||||||
|
</navigation>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
plugins {
|
||||||
|
alias(libs.plugins.com.android.library)
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'one.nem.lacerta.data'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
minSdk 26
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
consumerProguardFiles "consumer-rules.pro"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation libs.androidx.appcompat
|
||||||
|
implementation libs.com.google.android.material
|
||||||
|
testImplementation libs.junit
|
||||||
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
|
// Hilt (DI)
|
||||||
|
implementation libs.com.google.dagger.hilt.android
|
||||||
|
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||||
|
|
||||||
|
// 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
|
||||||
|
|
||||||
|
// Utilsモジュール
|
||||||
|
implementation project(':utils')
|
||||||
|
|
||||||
|
// 型モジュール
|
||||||
|
implementation project(':model')
|
||||||
|
|
||||||
|
// データソースモジュール
|
||||||
|
implementation project(':source')
|
||||||
|
|
||||||
|
implementation project(':vcs')
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("one.nem.lacerta.data.test", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import java.lang.reflect.Array;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||||
|
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントのデータを取得する
|
||||||
|
*/
|
||||||
|
public interface Document {
|
||||||
|
|
||||||
|
CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta);
|
||||||
|
|
||||||
|
CompletableFuture<DocumentDetail> createDocument();
|
||||||
|
|
||||||
|
CompletableFuture<Void> deleteDocument(String documentId);
|
||||||
|
|
||||||
|
CompletableFuture<Void> updateDocument(DocumentDetail detail);
|
||||||
|
|
||||||
|
CompletableFuture<DocumentDetail> getDocument(String documentId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
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
|
||||||
|
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit);
|
||||||
|
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset);
|
||||||
|
|
||||||
|
// Get Library page
|
||||||
|
CompletableFuture<LibraryItemPage> getLibraryPage(int limit);
|
||||||
|
CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset);
|
||||||
|
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
|
||||||
|
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
|
||||||
|
|
||||||
|
// Create Folder
|
||||||
|
CompletableFuture<String> createFolder(String path, String name);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
|
||||||
|
public interface LacertaSearch {
|
||||||
|
|
||||||
|
ArrayList<ListItem> autoSearch(String query, int limit);
|
||||||
|
|
||||||
|
ArrayList<ListItem> autoSearch(String query, int limit, int offset);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,221 @@
|
|||||||
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
|
||||||
|
// Lacerta/source
|
||||||
|
import one.nem.lacerta.model.document.internal.XmlMetaModel;
|
||||||
|
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||||
|
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||||
|
|
||||||
|
// Lacerta/utils
|
||||||
|
import one.nem.lacerta.source.file.FileManager;
|
||||||
|
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
// Lacerta/vcs
|
||||||
|
import one.nem.lacerta.utils.XmlMetaParser;
|
||||||
|
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
|
||||||
|
public class DocumentImpl implements Document {
|
||||||
|
|
||||||
|
String TAG = getClass().getSimpleName();
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaDatabase database;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory vcsFactory;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
FileManagerFactory fileManagerFactory;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
DeviceInfoUtils deviceInfoUtils;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
XmlMetaParser xmlMetaParser;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public DocumentImpl() {
|
||||||
|
// Init
|
||||||
|
// logger.debug(TAG, "called");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
DocumentDetail detail = new DocumentDetail();
|
||||||
|
detail.setMeta(meta);
|
||||||
|
detail.setPages(new ArrayList<>());
|
||||||
|
// 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();
|
||||||
|
|
||||||
|
database.documentDao().insert(documentEntity);
|
||||||
|
|
||||||
|
// Vcs
|
||||||
|
LacertaVcs vcs = vcsFactory.create(meta.getId());
|
||||||
|
vcs.createDocument(meta.getId());
|
||||||
|
|
||||||
|
// XmlMeta
|
||||||
|
updateXmlMeta(detail).join();
|
||||||
|
|
||||||
|
return detail;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<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 CompletableFuture<Void> deleteDocument(String documentId) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<Void> updateDocument(DocumentDetail detail) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
updateXmlMeta(detail).join();
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<DocumentDetail> getDocument(String documentId) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
DocumentEntity documentEntity = database.documentDao().findById(documentId);
|
||||||
|
if (documentEntity == null) {
|
||||||
|
throw new IllegalArgumentException("documentId is not found");
|
||||||
|
}
|
||||||
|
DocumentMeta meta = new DocumentMeta();
|
||||||
|
meta.setId(documentEntity.id);
|
||||||
|
meta.setTitle(documentEntity.title);
|
||||||
|
meta.setAuthor(documentEntity.author);
|
||||||
|
meta.setDefaultBranch(documentEntity.defaultBranch);
|
||||||
|
meta.setUpdatedAt(documentEntity.updatedAt);
|
||||||
|
meta.setCreatedAt(documentEntity.createdAt);
|
||||||
|
meta.setPath(new PublicPath().resolve(documentEntity.publicPath));
|
||||||
|
meta.setTags(new ArrayList<>()); // TODO-rca: タグを取得する
|
||||||
|
|
||||||
|
DocumentDetail detail = new DocumentDetail();
|
||||||
|
|
||||||
|
getPagesByXmlMeta(documentId).thenCompose(xmlMetaPageModels -> getPagesByXmlMetaPageModel(documentId, xmlMetaPageModels)).thenAccept(pages -> {
|
||||||
|
logger.debug(TAG, "pages: " + pages.size());
|
||||||
|
detail.setMeta(meta);
|
||||||
|
detail.setPages(pages);
|
||||||
|
}).join();
|
||||||
|
|
||||||
|
return detail;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<ArrayList<XmlMetaPageModel>> getPagesByXmlMeta(String documentId) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
|
||||||
|
try {
|
||||||
|
ArrayList<XmlMetaPageModel> xmlMetaPageModels = xmlMetaParser.deserialize(fileManager.resolve(documentId).loadXml("meta.xml")).getPages();
|
||||||
|
// Debug
|
||||||
|
logger.debug(TAG, "xmlMetaPageModels: " + xmlMetaPageModels.size());
|
||||||
|
for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
|
||||||
|
logger.debug(TAG, "\txmlMetaPageModel: " + xmlMetaPageModel.getFilename());
|
||||||
|
}
|
||||||
|
return xmlMetaPageModels;
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "DocumentMeta parse error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("db18c04a-1625-4871-9e4e-918d805568ac");
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<ArrayList<Page>> getPagesByXmlMetaPageModel(String documentId, ArrayList<XmlMetaPageModel> xmlMetaPageModels) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
ArrayList<Page> pages = new ArrayList<>();
|
||||||
|
FileManager fileManager;
|
||||||
|
try {
|
||||||
|
fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()).resolve(documentId);
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "FileManager resolve error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("2235e8ee-4177-46f8-af6b-084381b202e6");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
|
||||||
|
try {
|
||||||
|
pages.add(new Page(xmlMetaPageModel.getFilename(), fileManager.resolve("raw").loadBitmap(xmlMetaPageModel.getFilename())));
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "Bitmap decode error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("3bba8c8f-90fb-4a24-a726-7ea201929f8b");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return pages;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<Void> updateXmlMeta(DocumentDetail documentDetail) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
// TODO-rca: リビジョンIDを検証する, 挿入する
|
||||||
|
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
|
||||||
|
ArrayList<XmlMetaPageModel> xmlMetaPageModels = new ArrayList<>();
|
||||||
|
for (Page page : documentDetail.getPages()) {
|
||||||
|
xmlMetaPageModels.add(new XmlMetaPageModel(page.getFileName()));
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
fileManager.createDirectoryIfNotExist(documentDetail.getMeta().getId()).resolve(documentDetail.getMeta().getId())
|
||||||
|
.createFileIfNotExist("meta.xml").resolve("meta.xml").saveXml(xmlMetaParser.serialize(new XmlMetaModel("revisionId_PLACEHOLDER", xmlMetaPageModels)));
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "DocumentMeta serialize error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("e3b4d0c9-5b7e-4b7e-9e9a-5b8b8b8b8b8b");
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||