Compare commits
1467 Commits
v0.1.0-int
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| d2ace696ca | |||
| b320aeedca | |||
|
|
376d1c7014 | ||
| 0fe0f5dd00 | |||
| 2fcab4e931 | |||
| 9288360eb4 | |||
| 841258d82a | |||
| 8f7594c628 | |||
| f77b7c7089 | |||
| bfce8039ae | |||
| d4947e1ca8 | |||
| abdab63bb8 | |||
| 4d2973eaae | |||
| 06e965d4ae | |||
| 356397b71f | |||
| 67a2a303cf | |||
| 0100541fc2 | |||
| 266920349e | |||
| 71e573af29 | |||
| b7232d2723 | |||
| f7a71c70ed | |||
| c3e1825542 | |||
| 0c27cf6b24 | |||
| 6d17811ada | |||
| b756eea9bb | |||
| 80941c39d6 | |||
| 7dcec94c03 | |||
| f1d947e159 | |||
| d9a9cd0743 | |||
| a569182fd1 | |||
| 756b735884 | |||
| e460bcbe6e | |||
| e4418e6322 | |||
| b60bc92495 | |||
| 2cb6b45cbd | |||
| fb17848ad1 | |||
| aee7f523d9 | |||
| 9a8180ab65 | |||
| c095b50bf5 | |||
| 6693275dd9 | |||
| 5da9e14d61 | |||
| 0410377c77 | |||
| e583481b9a | |||
| 9861dfe5b6 | |||
| 732f599df9 | |||
| 4c30def77b | |||
| 21279e0c9a | |||
| 6f37ed988b | |||
| 26b76fa3e0 | |||
| 282c09bbd1 | |||
| 17590660c7 | |||
| 13efbaf9bb | |||
| 9042817d63 | |||
| 426a3534c8 | |||
| 1e046e7b9e | |||
| afb40170ca | |||
| dbdb2b76d7 | |||
| bdf6bae5fa | |||
| 83cadceefa | |||
| 8731855849 | |||
| d38a60508d | |||
| cc1d2d2756 | |||
| 6413ffae88 | |||
| 8a64d84ff7 | |||
| 7f82358fa8 | |||
| 06f6048b78 | |||
| e1c79e44ae | |||
| 65b87ef346 | |||
| 57fc9c5a73 | |||
| a8ee792928 | |||
|
|
a3b3000d59 | ||
| 1fb37a0317 | |||
| 57d1c7809c | |||
| 4158faf453 | |||
| beef661e3b | |||
| 8329769028 | |||
| 49ac5c2ddc | |||
| 5645cf64b6 | |||
| d76d0a02e2 | |||
| 719769c045 | |||
| b0a0682561 | |||
| 3c75a04a5f | |||
|
|
0a0a4b56b9 | ||
| d393087ff6 | |||
| d691ee0126 | |||
| e85c8a7ed0 | |||
| c44fd3ae8b | |||
| 1a2cf77f62 | |||
| 19f6eb1683 | |||
| f673954bef | |||
| 6fdef14eec | |||
| dcfb22f6a0 | |||
| f2bbfca36c | |||
| 972487fec1 | |||
| 1fd992fb4a | |||
| 8b1af8e2d7 | |||
| 53ae1dadb8 | |||
| 7bcb2f07ab | |||
| da78f5eef1 | |||
| fcdb7c838b | |||
| 7086582fad | |||
| 9084613e38 | |||
| c849fdae2e | |||
| 6d73bede6b | |||
| 74784a76d3 | |||
| 4e17c5636c | |||
| 331a520be0 | |||
| 0735c90d5e | |||
| ea345c45e4 | |||
| 50f00411ca | |||
| 1e0ba33519 | |||
| b32ce60ad8 | |||
| 55ceb2838e | |||
| bbc8674c0b | |||
| 4ed8d96caa | |||
| 141c91e1d7 | |||
| 68dddbabee | |||
| efdf9c1fea | |||
| a13f6e28ec | |||
| fa4f074871 | |||
| 3715627c07 | |||
| 8542869a63 | |||
| d66546a567 | |||
| f2f4c77016 | |||
| 9a4d3a1310 | |||
| bf58f25cd5 | |||
| 04e0c9c05a | |||
| 4770977e66 | |||
| d794bb97b6 | |||
| 0d5c3c4337 | |||
| 67a8f42ef1 | |||
| 79a64c3108 | |||
| 6847af9b9a | |||
| d562447777 | |||
| 425616c335 | |||
| dcd10b7d2b | |||
| 1515e53484 | |||
| 8ca05fe454 | |||
| 33766fbe18 | |||
|
|
5e0310beb2 | ||
| d8c525fe37 | |||
| 8af2afe996 | |||
| 9045cec67d | |||
| ab92c6ce93 | |||
| 10621d2935 | |||
| 45c2b5f0fb | |||
| 6ed09e6103 | |||
|
|
23489e20c6 | ||
| 8f0bdbb89a | |||
| 289f70c6cb | |||
| fa9b86e909 | |||
| 88c801aedf | |||
| 6f9384039a | |||
| 457eabcdf4 | |||
| fa985b86bd | |||
| 0dafecc75d | |||
| 47c6478227 | |||
| 671718ba83 | |||
| 0210bcaeb6 | |||
| 3a13b8e4b7 | |||
| b3c1f3a949 | |||
| c88ab85cf2 | |||
| 8270156373 | |||
| aa2ee9462f | |||
| 8052b9b329 | |||
| b7414cf8aa | |||
| 435fe7b3ce | |||
| b86843bd57 | |||
| b9c1c521cf | |||
| f9df1379f4 | |||
| 4649399ef9 | |||
| e1bc6466e7 | |||
| eeeef90ec2 | |||
| 8038b7e198 | |||
| 3afe8ce4cb | |||
| a239fd2f9c | |||
| 314214f734 | |||
| 92167656fc | |||
| beceec0abe | |||
| 0a96a9443d | |||
| ff5ef8611a | |||
| 9110352f68 | |||
| a2a3d2ab54 | |||
| 5f0e88d804 | |||
| 874946a38d | |||
| 6ec0710bac | |||
| adcf9f16b9 | |||
| b7822945fd | |||
| 2812b02ba2 | |||
| e6cdba337e | |||
| bd1ea74c4c | |||
| adb60b7fb2 | |||
| a0dc49ab95 | |||
| f693c5e88b | |||
| a349bc7317 | |||
| f9938867ae | |||
| 79beb8f87f | |||
| 8e1127586d | |||
| ff210f50a9 | |||
| 6fbe4081d2 | |||
|
|
e517e08b51 | ||
| 63f1dff6f0 | |||
| 8ec4e51eb0 | |||
| b29df41b5e | |||
| 9978b26ace | |||
| f3afb68b18 | |||
| 98e0ea6f85 | |||
|
|
f29e626f03 | ||
| 383a7020ce | |||
| f71aabed2a | |||
| 8256d01682 | |||
| 4d7f38a0f7 | |||
| 13e8ee7d87 | |||
| 41776b360b | |||
| 8a656f673d | |||
| e5ba889780 | |||
| c717f4c596 | |||
| be64f5a186 | |||
| 1654700ee0 | |||
| 7a106b1ed3 | |||
| 97b1806407 | |||
| d7bfcd8970 | |||
| 575df32157 | |||
| 0a98cfd8a5 | |||
| cd784cad15 | |||
| 68635e2f12 | |||
| 244fba1616 | |||
| 3ac7c4072d | |||
| 4bdb1a489c | |||
| 45e6b9ab05 | |||
| 98b141f96f | |||
| 4ffcd970b4 | |||
| e43c3beda0 | |||
| c43b516320 | |||
| e1f2a43d0b | |||
| 217b152c47 | |||
| a187ef3523 | |||
| 74563f75b1 | |||
| 055f1fdae1 | |||
|
|
77830ca96b | ||
| bda2b82cea | |||
| c05c80f3e7 | |||
| 9ba3c224c4 | |||
| 603a758ab6 | |||
| c7f5502535 | |||
| 7ef75bb375 | |||
| 78d4345313 | |||
| 542c04b908 | |||
| cf257a44ec | |||
| f812e6c38e | |||
| 87c913811b | |||
| 3cfd54faf0 | |||
| ffeb701b40 | |||
| c48e5becac | |||
| 7291ab243e | |||
| a34109441f | |||
| 75045c3fe3 | |||
| 733371ecbc | |||
| 5096e8de23 | |||
| 6679f8389c | |||
| 8df63b0ac6 | |||
| 4df56774c3 | |||
| 834ee42353 | |||
| 8a2b4ed12d | |||
| 58e74dbb16 | |||
| 9d750b5244 | |||
| e96d213c33 | |||
| c2f62a5a84 | |||
| dbef7b45d1 | |||
| 3c079ffc23 | |||
| f1667788aa | |||
| cad97ef7a3 | |||
|
|
5e5e98f0b6 | ||
| 513af3fda8 | |||
| b0effa21a4 | |||
| 21b198bc35 | |||
| fad9fcc48a | |||
| 8acbe6338b | |||
| 2f9df5a225 | |||
| fc56781c20 | |||
| 3960c07482 | |||
| 6902fbebbd | |||
| 515a881428 | |||
| cf623c5640 | |||
| 4cc4151254 | |||
| c4bd3d761e | |||
| 9bff04ce2e | |||
| 7ab5449b2d | |||
|
|
94def7bf1c | ||
| b259f11529 | |||
| c2a8728098 | |||
| 87f6d582dc | |||
| 885f1b40c8 | |||
| e7529ef62b | |||
| 4319e1d1ec | |||
| 7eb87305ea | |||
| 71986bb17d | |||
| 74fcc50615 | |||
| 3a47cd97fd | |||
| b44d1b0746 | |||
| 2dc3ab6bc6 | |||
| 165d45ad40 | |||
| 070cfda21d | |||
| 26b0994343 | |||
| 0f6412c792 | |||
| b5d7aa4edd | |||
| 1212d5111b | |||
| 28319a60ba | |||
| a818c59a02 | |||
| 5be465df67 | |||
| a3a5676136 | |||
| 062ecad4fd | |||
| cdc3019807 | |||
| a68ee50e6b | |||
| 7319c8c1a9 | |||
| 994ceb414e | |||
| 48ae5d7ac0 | |||
| f9f395c160 | |||
| 397244ffdd | |||
| 0dad6d30d4 | |||
| 950e0fe2dc | |||
| ea0e52a602 | |||
| fce59d74bc | |||
| 512ac0b775 | |||
| 05915a2f4e | |||
| 396c5e914f | |||
| ae0f023e0e | |||
| b91f0ae022 | |||
| 0cdd4b1af1 | |||
| 6e50239c9e | |||
| cf60bc3423 | |||
| 57ec698b78 | |||
|
|
3f84b1a3e2 | ||
| 4779d51976 | |||
| 1aeb0184a7 | |||
| 74ee492b49 | |||
| 4f864eb57d | |||
| 6b44435656 | |||
| 44edd1c23e | |||
| d5ebc2c498 | |||
| ce1686a1d7 | |||
| 5f89955d80 | |||
| 58f9d81555 | |||
| e51ce209dc | |||
| fd9b69174d | |||
| dde9d460ed | |||
| bf756abb16 | |||
| 0128cecfae | |||
| 04bd081d99 | |||
| 4f3c79564b | |||
| 6c8fdc4d81 | |||
| 232967c905 | |||
| 20ecbeea5c | |||
|
|
1a1dfe1be2 | ||
| dfe6049775 | |||
| 69d64fd44f | |||
| 87054f1b83 | |||
| 6cff3dd6b4 | |||
| 1dff7381af | |||
| af55033914 | |||
| 4ad5df6c98 | |||
| 7fa3588127 | |||
| dbd719368f | |||
| 7a9c81282f | |||
| 6710ae9d56 | |||
| 705b89a500 | |||
| afa3460b24 | |||
| 45fcd95e6f | |||
| 6ef54e5940 | |||
| 5c165b96d3 | |||
| 240b4675c8 | |||
| ccfed654df | |||
| 03d78b1200 | |||
| a815d3b1b4 | |||
| dfbe26ee9a | |||
| 420197e5c3 | |||
| 38a277c15e | |||
| 031ef6f088 | |||
| 1477169f6c | |||
| d94aab43d5 | |||
| 434d58bd47 | |||
| b341c78432 | |||
| a711f7284d | |||
| 4f8751e4b3 | |||
| 5bac9657ac | |||
| bc3b74989d | |||
| d4c10d8c05 | |||
|
|
517b7d2c39 | ||
| c1c705729a | |||
| 0b7b499624 | |||
| 6b3d0c0dae | |||
| 113bca723f | |||
| 383b34c3d2 | |||
| 70380df8fd | |||
| 749cad231c | |||
| da5b134a2b | |||
| 16dfccca14 | |||
| dfd488329b | |||
| 4b1ae7326b | |||
| 6e9606b050 | |||
| d778840484 | |||
| 93cef07ce5 | |||
| 826f8928d1 | |||
| d3afdbcef5 | |||
| f6bc9167d2 | |||
| f59c4445dc | |||
| 929ba7347c | |||
| 8c4e651a79 | |||
| cd1a58dcc0 | |||
| b58e80f7ea | |||
| daab41620f | |||
| 615d58f3ca | |||
| 5639117e0e | |||
| 1b60b15187 | |||
| 7822fdd3c5 | |||
| 778473f898 | |||
| bd8edc85ce | |||
| 5fc8a501ad | |||
| aa2ebce32c | |||
| 8d4d9cab9a | |||
| f6f7c3a630 | |||
| 3fbdc761dd | |||
| 3c237d3751 | |||
| 85dba22f57 | |||
| 3d01ff3d81 | |||
| d5ca5ebc90 | |||
| fc1c8f66cc | |||
| b6f0a5554a | |||
| dafb49cca0 | |||
| 904ae8d39f | |||
| 895cf64a15 | |||
| 93e7c10393 | |||
|
|
ab5a8bfa87 | ||
|
|
29d0737c00 | ||
|
|
281d1eeb39 | ||
|
|
c1b55ef29a | ||
|
|
0cbc81238c | ||
|
|
cf79581638 | ||
|
|
7beecca0da | ||
|
|
1447148fba | ||
| af53ba6c86 | |||
| 64d7a53616 | |||
| 696c58921d | |||
|
|
bda8496259 | ||
|
|
60f279d365 | ||
| 6e4904967b | |||
| fda8adae80 | |||
| 1ce3af59e6 | |||
| 1692399b9a | |||
| 5288855075 | |||
| 7ece8c7b69 | |||
| 56a49d4c7e | |||
|
|
e69d489a96 | ||
| 53c8114708 | |||
|
|
4611c46eca | ||
|
|
6f94b3408f | ||
| f65732c42b | |||
| 2821ad8552 | |||
| fc5ef3ed8f | |||
| ad05e3db44 | |||
| 18abe66031 | |||
| c5a0079812 | |||
| 73c2271782 | |||
| 06771d2e74 | |||
| 09c6d47a47 | |||
| 29f745bb5c | |||
| cef688187a | |||
| da26641e2f | |||
| 9f50696b39 | |||
| 9865790a98 | |||
| 5df0c7ee52 | |||
| 872bbd0f4e | |||
| 8e2af0c963 | |||
| b3d095fa40 | |||
| 1c71ac6545 | |||
| c731749233 | |||
| 0ef6863992 | |||
| 1a247d9b8b | |||
| ce4656558a | |||
| 32b238df58 | |||
| 87099ae693 | |||
| b11b78fa7f | |||
| cd0c5e81c5 | |||
| b9d81ab997 | |||
| a61de24931 | |||
| 9de39309bc | |||
|
|
9d229a2857 | ||
| da9cd9be8e | |||
| 0b2d58470b | |||
| ed5e699493 | |||
| 29737303af | |||
|
|
151c2dde25 | ||
| 18eee403ef | |||
|
|
2b9a68b6f5 | ||
| b820f42007 | |||
| af8935cd7f | |||
| 6c50675938 | |||
| 791084b737 | |||
| 15d4a369d8 | |||
| 07e14eb90c | |||
| b13f048c7e | |||
| f0ed4327ca | |||
| b852e9b7ee | |||
|
|
ca063709dd | ||
| 67de02b502 | |||
| 5fafbec247 | |||
| e104b3d8ff | |||
| d8d8a5932b | |||
| 113a2fd3d2 | |||
| 4714e3d8cb | |||
| 14ff9abab9 | |||
| 1105c17fca | |||
| 37a18704e3 | |||
| d5df291c81 | |||
| 3178e9233b | |||
| 004bedb45f | |||
| de30eb241c | |||
| c7f2a3eebe | |||
| 2a7e329ad7 | |||
| 52f41881fd | |||
| 68fb0b719b | |||
| da8d4fb4fc | |||
| f7d07b0ec3 | |||
| 7f71e818a8 | |||
| fc6cbb9d37 | |||
| df3edbf354 | |||
| d40b188f87 | |||
| 253c77d6f5 | |||
| b87b635d2b | |||
| 9df033af73 | |||
| 58e0686304 | |||
| a0f89de1ac | |||
| fe4999384a | |||
| bc304f8535 | |||
| e77fafc108 | |||
| 305cbcd679 | |||
| c06d7e6b15 | |||
| 1648e0b7c1 | |||
| 04db160548 | |||
| 611c5b516d | |||
| 734f75b4c7 | |||
| 6e0c473c66 | |||
| 20828e2f0f | |||
| 3b684bec53 | |||
| afef074242 | |||
| 1ceb3e29b7 | |||
| a5fa89252c | |||
|
|
106bb93644 | ||
| ab39cd4d00 | |||
| d1a5cd2f23 | |||
| 0dc69e1d73 | |||
| 3d8ab69742 | |||
| 6bc43869c9 | |||
| 63dfbc120d | |||
| 064c4edfbe | |||
| 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 | ||
|
|
a5efab5838 | ||
|
|
f186064f6e | ||
|
|
866b8270fe | ||
|
|
e0af9381cb | ||
|
|
e70f930929 | ||
|
|
59a35cbb4a | ||
|
|
a78e60416d | ||
|
|
ac2001142f | ||
|
|
6d71322982 | ||
|
|
3bf14799b5 | ||
|
|
aaf4264f44 | ||
|
|
b097e8070a | ||
|
|
99ad244376 | ||
|
|
99817d3e33 | ||
|
|
ac5a950ce3 | ||
|
|
5a92c210f7 |
17
.github/ISSUE_TEMPLATE/不具合用テンプレート.md
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
---
|
||||
name: 不具合用テンプレート
|
||||
about: 不具合用テンプレート
|
||||
title: "[BUG]: "
|
||||
labels: バグ
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
# 概要
|
||||
<!-- Issueの概要 -->
|
||||
|
||||
# 詳細
|
||||
<!-- バグの詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所(省略可) -->
|
||||
17
.github/ISSUE_TEMPLATE/改善用テンプレート.md
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
---
|
||||
name: 改善用テンプレート
|
||||
about: 改善用テンプレート
|
||||
title: "[IMPROVE]"
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
# 概要
|
||||
<!-- Issueの概要 -->
|
||||
|
||||
# 詳細
|
||||
<!-- 改善内容の詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所(省略可) -->
|
||||
16
.github/ISSUE_TEMPLATE/新機能用テンプレート.md
vendored
@ -1,10 +1,20 @@
|
||||
---
|
||||
name: 新機能用テンプレート
|
||||
about: 新規開発Issue用テンプレート
|
||||
about: 新規能用テンプレート
|
||||
title: ''
|
||||
labels: ''
|
||||
labels: 新機能
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
WIP
|
||||
# 概要
|
||||
<!-- Issueの概要 -->
|
||||
|
||||
# 詳細
|
||||
<!-- 機能の詳細 -->
|
||||
|
||||
# 関連Issue
|
||||
<!-- 関連するIssueがあれば -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所(省略可) -->
|
||||
|
||||
18
.github/PULL_REQUEST_TEMPLATE/general.md
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
# 概要
|
||||
<!-- PRの概要 -->
|
||||
|
||||
# 関連Issue
|
||||
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||
|
||||
# 詳細
|
||||
<!-- 詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所 -->
|
||||
|
||||
# チェック
|
||||
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||
- [ ] 機能として完成している
|
||||
- [ ] WIP(Work in progress: 作業中)
|
||||
- [ ] 正常にビルド/起動ができる
|
||||
- [ ] 既存の機能を壊していない
|
||||
10
.idea/deploymentTargetDropDown.xml
generated
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<value>
|
||||
<entry key="app">
|
||||
<State />
|
||||
</entry>
|
||||
</value>
|
||||
</component>
|
||||
</project>
|
||||
4
.idea/deploymentTargetSelector.xml
generated
@ -4,10 +4,10 @@
|
||||
<selectionStates>
|
||||
<SelectionState runConfigName="app">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
<DropdownSelection timestamp="2023-12-18T03:36:14.973846Z">
|
||||
<DropdownSelection timestamp="2024-01-20T07:15:21.179573376Z">
|
||||
<Target type="DEFAULT_BOOT">
|
||||
<handle>
|
||||
<DeviceId pluginId="PhysicalDevice" identifier="serial=ZY22H7V3G7" />
|
||||
<DeviceId pluginId="LocalEmulator" identifier="path=/home/rca/.android/avd/Pixel_3a_API_34_extension_level_7_x86_64.avd" />
|
||||
</handle>
|
||||
</Target>
|
||||
</DropdownSelection>
|
||||
|
||||
5
.idea/gradle.xml
generated
@ -4,6 +4,7 @@
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="jbr-17" />
|
||||
<option name="modules">
|
||||
@ -22,13 +23,15 @@
|
||||
<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/icon" />
|
||||
<option value="$PROJECT_DIR$/shared/ui" />
|
||||
<option value="$PROJECT_DIR$/source" />
|
||||
<option value="$PROJECT_DIR$/utils" />
|
||||
<option value="$PROJECT_DIR$/vcs" />
|
||||
<option value="$PROJECT_DIR$/viewer2" />
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveExternalAnnotations" value="false" />
|
||||
|
||||
2
.idea/misc.xml
generated
@ -1,6 +1,6 @@
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
18
PULL_REQUEST_TEMPLATE.md
Normal file
@ -0,0 +1,18 @@
|
||||
# 概要
|
||||
<!-- PRの概要 -->
|
||||
|
||||
# 関連Issue
|
||||
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||
|
||||
# 詳細
|
||||
<!-- 詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所 -->
|
||||
|
||||
# チェック
|
||||
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||
- [ ] 機能として完成している
|
||||
- [ ] WIP(Work in progress: 作業中)
|
||||
- [ ] 正常にビルド/起動ができる
|
||||
- [ ] 既存の機能を壊していない
|
||||
37
README.md
@ -1,17 +1,40 @@
|
||||
# Lacerta
|
||||
WIP
|
||||
## モジュール設計
|
||||
学習に便利な機能とGit-like VCSを持ったドキュメントスキャナ (Work In Progress)
|
||||
(グループワーク)
|
||||
|
||||
## モジュール設計
|
||||

|
||||
|
||||

|
||||
|
||||
## メモ
|
||||
- アイコン: Google Material Icons https://fonts.google.com/icons (Weight:300, Grade:0, Optical size: 24px)
|
||||
|
||||
## モジュール構成
|
||||
### モジュール一覧
|
||||
- `component` : コンポーネント
|
||||
- `common` : 共通コンポーネント
|
||||
- `scanner` : スキャナー
|
||||
- `viewer` : ビューワー
|
||||
- `data` : UIからデータを取得/保存するためのラッパーモジュール
|
||||
- `feature` : 機能モジュール(ナビゲーションからみた機能で分割)
|
||||
- `common`: 共通機能
|
||||
- `debug`: デバッグメニュー
|
||||
- `home`: ホーム画面
|
||||
- `library`: ライブラリ画面
|
||||
- `scan`: スキャン画面 (廃止予定)
|
||||
- `search`: 検索画面
|
||||
- `model` : データモデルをまとめたモジュール
|
||||
- `processor` : プロセッサ(例: `DocumentProcessor` : ドキュメント処理(ドキュメントにページを追加したり更新したり))
|
||||
- `shared`: 共有リソース
|
||||
- `ui`: UI要素(Theme, Drawable, Colorなど)
|
||||
- `source` : ソース(DB/FileManagerなど)
|
||||
- `utils` : ユーティリティ(ちょっとしたユーティリティをまとめたモジュール)
|
||||
|
||||
## コーディング規則/推奨(WIP)
|
||||
### 規則
|
||||
- `// TODO`コメントには任意のsuffixを付ける
|
||||
- 全員が同じ`// TODO:`を使っていると検索がむずかしくなるため
|
||||
- (例: `// TODO-rca:`)
|
||||
### 推奨
|
||||
- マジックナンバーは控える(必要な場合もあるので)
|
||||
|
||||
|
||||
## Thanks for
|
||||
- [SDA-SE/document-scanner-android](https://github.com/SDA-SE/document-scanner-android)
|
||||
-
|
||||
|
||||
@ -14,8 +14,8 @@ android {
|
||||
|
||||
// ベータ, Internal, Release問わず毎回インクリメントする
|
||||
// https://developer.android.com/studio/publish/versioning#versioningsettings
|
||||
versionCode 1
|
||||
versionName "0.1.0"
|
||||
versionCode 2
|
||||
versionName "0.2.0"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@ -59,32 +59,6 @@ dependencies {
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
|
||||
// 内部モジュール
|
||||
// Feature
|
||||
implementation project(':feature:home')
|
||||
implementation project(':feature:search')
|
||||
implementation project(':feature:library')
|
||||
implementation project(':feature:scan')
|
||||
implementation project(':feature:debug') // デバッグメニュー
|
||||
|
||||
// // Component
|
||||
// implementation project(':component:common')
|
||||
// implementation project(':component:scanner')
|
||||
// implementation project(':component:viewer')
|
||||
|
||||
// // Data
|
||||
// implementation project(':data:repository')
|
||||
//
|
||||
// // Source
|
||||
// implementation project(':data:source:database')
|
||||
// implementation project(':data:source:preference')
|
||||
//
|
||||
implementation project(':data')
|
||||
|
||||
implementation project(':shared:ui')
|
||||
|
||||
implementation project(':shared:icon')
|
||||
|
||||
// Hilt (DI)
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
@ -94,4 +68,20 @@ dependencies {
|
||||
implementation libs.navigation.ui
|
||||
implementation libs.navigation.dynamic.features.fragment
|
||||
|
||||
// Feature
|
||||
implementation project(':feature:home')
|
||||
implementation project(':feature:search')
|
||||
implementation project(':feature:library')
|
||||
implementation project(':feature:scan')
|
||||
implementation project(':feature:debug') // デバッグメニュー
|
||||
implementation project(':feature:setting') // 設定画面
|
||||
|
||||
implementation project(':data')
|
||||
implementation project(':shared:ui')
|
||||
|
||||
implementation project(':model')
|
||||
|
||||
implementation project(':utils')
|
||||
|
||||
implementation project(':component:scanner')
|
||||
}
|
||||
@ -2,14 +2,25 @@
|
||||
<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:icon="@mipmap/ic_launcher_final"
|
||||
android:name=".LacertaApplication"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:roundIcon="@mipmap/ic_launcher_final_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.Lacerta"
|
||||
tools:targetApi="31">
|
||||
@ -22,6 +33,16 @@
|
||||
<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>
|
||||
BIN
app/src/main/ic_launcher_final-playstore.png
Normal file
|
After Width: | Height: | Size: 5.9 KiB |
BIN
app/src/main/ic_launcher_temp-playstore.png
Normal file
|
After Width: | Height: | Size: 6.2 KiB |
@ -1,10 +1,12 @@
|
||||
package one.nem.lacerta;
|
||||
|
||||
import android.app.Application;
|
||||
import android.util.Log;
|
||||
|
||||
import com.google.android.material.color.DynamicColors;
|
||||
|
||||
import dagger.hilt.android.HiltAndroidApp;
|
||||
import one.nem.lacerta.utils.FeatureSwitch;
|
||||
|
||||
@HiltAndroidApp
|
||||
public class LacertaApplication extends Application {
|
||||
@ -12,7 +14,17 @@ public class LacertaApplication extends Application {
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
// DynamicColorを有効化
|
||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||
if (DynamicColors.isDynamicColorAvailable()) {
|
||||
Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
|
||||
if (FeatureSwitch.Meta.disableDynamicColor) {
|
||||
Log.d("DynamicColors", "DynamicColors is disabled by FeatureSwitch.");
|
||||
} else {
|
||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||
}
|
||||
} else {
|
||||
Log.d("DynamicColors", "DynamicColors is not available.");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,40 +1,200 @@
|
||||
package one.nem.lacerta;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import androidx.navigation.NavController;
|
||||
import androidx.navigation.NavOptions;
|
||||
import androidx.navigation.fragment.NavHostFragment;
|
||||
import androidx.navigation.ui.NavigationUI;
|
||||
|
||||
import android.app.ActivityOptions;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Color;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.widget.Toast;
|
||||
|
||||
import one.nem.lacerta.component.scanner.ScannerManagerActivity;
|
||||
import one.nem.lacerta.model.FragmentNavigation;
|
||||
import one.nem.lacerta.model.pref.FeatureSwitchOverride;
|
||||
import one.nem.lacerta.utils.FeatureSwitch;
|
||||
|
||||
import com.google.android.material.appbar.AppBarLayout;
|
||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
|
||||
|
||||
|
||||
import java.io.NotActiveException;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.utils.repository.SharedPrefUtils;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
public class MainActivity extends AppCompatActivity implements FragmentNavigation {
|
||||
|
||||
@Inject
|
||||
SharedPrefUtils sharedPrefUtils;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
// Debug
|
||||
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
||||
|
||||
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
||||
NavController navController = navHostFragment.getNavController();
|
||||
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
||||
|
||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
||||
// 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);
|
||||
|
||||
bottomNavigationView.setOnItemSelectedListener(item -> {
|
||||
NavOptions navOptions = new NavOptions.Builder()
|
||||
.setLaunchSingleTop(true)
|
||||
.setEnterAnim(androidx.navigation.ui.R.anim.nav_default_enter_anim)
|
||||
.setExitAnim(androidx.navigation.ui.R.anim.nav_default_exit_anim)
|
||||
.setPopEnterAnim(androidx.navigation.ui.R.anim.nav_default_pop_enter_anim)
|
||||
.setPopExitAnim(androidx.navigation.ui.R.anim.nav_default_pop_exit_anim)
|
||||
.build();
|
||||
|
||||
navController.navigate(item.getItemId(), null, navOptions);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
catch (Exception e) {
|
||||
Log.e("Init", "Failed to init navigation");
|
||||
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));
|
||||
|
||||
// Fab
|
||||
findViewById(R.id.scanFab).setOnClickListener(v -> {
|
||||
Toast.makeText(this, "Scan", Toast.LENGTH_SHORT).show();
|
||||
Intent intent = new Intent(this.getApplicationContext(), ScannerManagerActivity.class);
|
||||
// startActivity(intent);
|
||||
startActivity(intent, ActivityOptions.makeCustomAnimation(this, one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
|
||||
});
|
||||
|
||||
Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
}
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
if (requestCode == 1) {
|
||||
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||
Toast.makeText(this, "Permission granted", Toast.LENGTH_SHORT).show();
|
||||
} else {
|
||||
Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(this, "カメラの権限は必須です.", Toast.LENGTH_LONG).show();
|
||||
finish(); // Exit app
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void initializeApp() {
|
||||
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();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void navigateToFragment(Fragment fragment, boolean addToBackStack) {
|
||||
if (addToBackStack) {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.addToBackStack(null)
|
||||
.commit();
|
||||
} else {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.commit();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void navigateToFragment(Fragment fragment, boolean addToBackStack, boolean clearBackStack) {
|
||||
if (clearBackStack) {
|
||||
getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
|
||||
}
|
||||
if (addToBackStack) {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.addToBackStack(null)
|
||||
.commit();
|
||||
} else {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.commit();
|
||||
}
|
||||
}
|
||||
|
||||
public void navigateToFragmentAlternate(Fragment fragment, boolean addToBackStack) {
|
||||
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
|
||||
|
||||
// get the current fragment
|
||||
Fragment currentFragment = getSupportFragmentManager().getPrimaryNavigationFragment();
|
||||
|
||||
// hide the current fragment
|
||||
if (currentFragment != null) {
|
||||
transaction.hide(currentFragment);
|
||||
}
|
||||
|
||||
// Add the new fragment
|
||||
transaction.add(R.id.nav_host_fragment, fragment);
|
||||
|
||||
// Add the transaction to the back stack if needed
|
||||
if (addToBackStack) {
|
||||
transaction.addToBackStack(null);
|
||||
}
|
||||
|
||||
// Commit the transaction
|
||||
transaction.commit();
|
||||
|
||||
// Update the primary navigation fragment
|
||||
getSupportFragmentManager().beginTransaction().setPrimaryNavigationFragment(fragment).commit();
|
||||
}
|
||||
}
|
||||
|
||||
15
app/src/main/res/drawable/ic_launcher_final_foreground.xml
Normal file
@ -0,0 +1,15 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<group android:scaleX="0.37"
|
||||
android:scaleY="0.37"
|
||||
android:translateX="302.4"
|
||||
android:translateY="302.4">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M92.12,225.15L92.12,51.92L265.15,51.92L265.15,107.88L148.08,107.88L148.08,225.15L92.12,225.15ZM812.12,225.15L812.12,107.88L694.85,107.88L694.85,51.92L868.08,51.92L868.08,225.15L812.12,225.15ZM92.12,907.88L92.12,734.85L148.08,734.85L148.08,851.92L265.15,851.92L265.15,907.88L92.12,907.88ZM694.85,907.88L694.85,851.92L812.12,851.92L812.12,734.85L868.08,734.85L868.08,907.88L694.85,907.88ZM268.08,719.61Q268.08,724.42 271.83,728.17Q275.58,731.92 280.39,731.92L679.81,731.92Q684.42,731.92 688.27,728.17Q692.12,724.42 692.12,719.61L692.12,240.19Q692.12,235.58 688.27,231.73Q684.42,227.88 679.81,227.88L280.39,227.88Q275.58,227.88 271.83,231.73Q268.08,235.58 268.08,240.19L268.08,719.61ZM280.39,787.88Q251.74,787.88 231.93,768.07Q212.12,748.26 212.12,719.61L212.12,240.19Q212.12,211.76 231.93,191.84Q251.74,171.92 280.39,171.92L679.81,171.92Q708.24,171.92 728.16,191.84Q748.08,211.76 748.08,240.19L748.08,719.61Q748.08,748.26 728.16,768.07Q708.24,787.88 679.81,787.88L280.39,787.88ZM372.12,387.88L588.08,387.88L588.08,331.92L372.12,331.92L372.12,387.88ZM372.12,507.88L588.08,507.88L588.08,451.92L372.12,451.92L372.12,507.88ZM372.12,627.88L588.08,627.88L588.08,571.92L372.12,571.92L372.12,627.88ZM268.08,719.61L268.08,240.19Q268.08,235.58 268.08,231.73Q268.08,227.88 268.08,227.88L268.08,227.88Q268.08,227.88 268.08,231.73Q268.08,235.58 268.08,240.19L268.08,719.61Q268.08,724.42 268.08,728.17Q268.08,731.92 268.08,731.92L268.08,731.92Q268.08,731.92 268.08,728.17Q268.08,724.42 268.08,719.61Z"/>
|
||||
</group>
|
||||
</vector>
|
||||
15
app/src/main/res/drawable/ic_launcher_temp_foreground.xml
Normal file
@ -0,0 +1,15 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#5F4769">
|
||||
<group android:scaleX="0.377"
|
||||
android:scaleY="0.377"
|
||||
android:translateX="7.476"
|
||||
android:translateY="7.476">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z"/>
|
||||
</group>
|
||||
</vector>
|
||||
@ -18,15 +18,33 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:navGraph="@navigation/main_nav"
|
||||
tools:layout="@layout/fragment_debug_menu_container" />
|
||||
tools:layout="@layout/fragment_home_top" />
|
||||
|
||||
<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"/>
|
||||
app:menu="@menu/bottom_nav_menu" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/scanFab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="32dp"
|
||||
android:layout_marginBottom="32dp"
|
||||
android:clickable="true"
|
||||
app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:srcCompat="@drawable/ic_baseline_add_24" />
|
||||
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -4,17 +4,26 @@
|
||||
<item
|
||||
android:id="@id/feature_home_navigation"
|
||||
android:icon="@drawable/home_24px"
|
||||
android:title="Home"/>
|
||||
android:title="@string/home_title"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_search_navigation"
|
||||
android:icon="@drawable/search_24px"
|
||||
android:title="@string/search_title"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_library_navigation"
|
||||
android:icon="@drawable/folder_24px"
|
||||
android:title="Library"/>
|
||||
android:title="@string/library_title"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_debug_navigation"
|
||||
android:icon="@drawable/developer_mode_24px"
|
||||
android:title="Debug menu"/>
|
||||
android:title="@string/debug_menu_title" />
|
||||
|
||||
<item
|
||||
android:id="@id/feature_setting_navigation"
|
||||
android:icon="@drawable/settings_24px"
|
||||
android:title="@string/setting_title"/>
|
||||
|
||||
</menu>
|
||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_final.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_final_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
|
||||
</adaptive-icon>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_final_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
|
||||
</adaptive-icon>
|
||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_temp.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_temp_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_temp_foreground"/>
|
||||
</adaptive-icon>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_temp_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_temp_foreground"/>
|
||||
</adaptive-icon>
|
||||
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_final.webp
Normal file
|
After Width: | Height: | Size: 888 B |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_final_round.webp
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_temp.webp
Normal file
|
After Width: | Height: | Size: 768 B |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_temp_round.webp
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_final.webp
Normal file
|
After Width: | Height: | Size: 728 B |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_final_round.webp
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_temp.webp
Normal file
|
After Width: | Height: | Size: 630 B |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_temp_round.webp
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_final.webp
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_final_round.webp
Normal file
|
After Width: | Height: | Size: 3.0 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_temp.webp
Normal file
|
After Width: | Height: | Size: 1004 B |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_temp_round.webp
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_final.webp
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_final_round.webp
Normal file
|
After Width: | Height: | Size: 4.9 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_temp.webp
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_temp_round.webp
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_final.webp
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_final_round.webp
Normal file
|
After Width: | Height: | Size: 6.7 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_temp.webp
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_temp_round.webp
Normal file
|
After Width: | Height: | Size: 6.9 KiB |
@ -2,7 +2,7 @@
|
||||
<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_debug_navigation">
|
||||
app:startDestination="@id/feature_home_navigation">
|
||||
|
||||
<include app:graph="@navigation/feature_debug_navigation" />
|
||||
|
||||
@ -10,5 +10,9 @@
|
||||
|
||||
<include app:graph="@navigation/feature_home_navigation" />
|
||||
|
||||
<include app:graph="@navigation/feature_search_navigation" />
|
||||
|
||||
<include app:graph="@navigation/feature_setting_navigation" />
|
||||
|
||||
|
||||
</navigation>
|
||||
4
app/src/main/res/values/ic_launcher_final_background.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_final_background">#B8D3C3</color>
|
||||
</resources>
|
||||
4
app/src/main/res/values/ic_launcher_temp_background.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_temp_background">#A386EB</color>
|
||||
</resources>
|
||||
4
app/src/main/res/xml/provider_path.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<paths>
|
||||
<cache-path name="cache" path="." />
|
||||
</paths>
|
||||
@ -1,10 +1,11 @@
|
||||
plugins {
|
||||
alias(libs.plugins.com.android.library)
|
||||
id 'com.google.dagger.hilt.android'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'one.nem.lacerta.component.common'
|
||||
compileSdk 33
|
||||
compileSdk 34
|
||||
|
||||
defaultConfig {
|
||||
minSdk 26
|
||||
@ -32,4 +33,15 @@ dependencies {
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
|
||||
// Hilt (DI)
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
|
||||
implementation project(':shared:ui')
|
||||
implementation project(':utils')
|
||||
implementation project(':model')
|
||||
implementation project(':data')
|
||||
|
||||
implementation project(':vcs')
|
||||
}
|
||||
@ -0,0 +1,83 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.CheckBox;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
|
||||
public class LacertaApplyTagAdapter extends RecyclerView.Adapter<LacertaApplyTagAdapter.LacertaApplyTagViewHolder>{
|
||||
|
||||
// Listener
|
||||
public interface LacertaApplyTagDialogListener {
|
||||
void itemChecked(View view, String tagId);
|
||||
void itemUnchecked(View view, String tagId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
private ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList;
|
||||
private LacertaApplyTagDialogListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaApplyTagAdapter setListener(LacertaApplyTagDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagAdapter setDocumentTagArrayList(ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList) {
|
||||
this.documentTagArrayList = documentTagArrayList;
|
||||
return this;
|
||||
}
|
||||
|
||||
// Empty constructor
|
||||
public LacertaApplyTagAdapter() {
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public LacertaApplyTagAdapter.LacertaApplyTagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.apply_tag_list_item, parent, false);
|
||||
return new LacertaApplyTagAdapter.LacertaApplyTagViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull LacertaApplyTagAdapter.LacertaApplyTagViewHolder holder, int position) {
|
||||
DocumentTagApplyTagDialogExtendedModel documentTag = documentTagArrayList.get(position);
|
||||
if (holder.checkBox == null) {
|
||||
Log.d("LacertaApplyTagAdapter", "onBindViewHolder: holder.checkBox is null");
|
||||
}
|
||||
holder.checkBox.setText(documentTag.getName());
|
||||
holder.checkBox.setChecked(documentTag.getIsChecked());
|
||||
holder.checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
||||
if (isChecked) {
|
||||
listener.itemChecked(buttonView, documentTag.getId());
|
||||
} else {
|
||||
listener.itemUnchecked(buttonView, documentTag.getId());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return documentTagArrayList == null ? 0 : documentTagArrayList.size();
|
||||
}
|
||||
|
||||
public class LacertaApplyTagViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
CheckBox checkBox;
|
||||
|
||||
public LacertaApplyTagViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
checkBox = itemView.findViewById(R.id.tag_check_box);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,184 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.Checkable;
|
||||
import android.widget.EditText;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.CompletionException;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaApplyTagDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaApplyTagDialogListener {
|
||||
void onDialogPositiveClick(ArrayList<DocumentTag> appliedTags);
|
||||
void onDialogNegativeClick();
|
||||
}
|
||||
|
||||
// Variables
|
||||
private String title;
|
||||
private String message;
|
||||
private String positiveButtonText;
|
||||
private String negativeButtonText;
|
||||
private String documentId;
|
||||
private LacertaApplyTagDialogListener listener;
|
||||
private ArrayList<DocumentTag> registeredTags;
|
||||
private ArrayList<DocumentTag> appliedTags;
|
||||
|
||||
// Setter
|
||||
|
||||
public LacertaApplyTagDialog setListener(LacertaApplyTagDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setDocumentId(String documentId) {
|
||||
this.documentId = documentId;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_apply_tag, null);
|
||||
|
||||
// RecyclerView
|
||||
RecyclerView recyclerView = view.findViewById(R.id.apply_tag_list);
|
||||
|
||||
LacertaApplyTagAdapter lacertaApplyTagAdapter = new LacertaApplyTagAdapter();
|
||||
lacertaApplyTagAdapter.setListener(new LacertaApplyTagAdapter.LacertaApplyTagDialogListener() {
|
||||
@Override
|
||||
public void itemChecked(View view, String tagId) {
|
||||
applyChangeToVariable(true, tagId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void itemUnchecked(View view, String tagId) {
|
||||
applyChangeToVariable(false, tagId);
|
||||
}
|
||||
});
|
||||
|
||||
recyclerView.setAdapter(lacertaApplyTagAdapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
|
||||
|
||||
getDocumentTagArrayList(documentId).thenAccept(documentTagArrayList -> {
|
||||
lacertaApplyTagAdapter.setDocumentTagArrayList(documentTagArrayList);
|
||||
lacertaApplyTagAdapter.notifyDataSetChanged(); // TODO-rca: アニメーション
|
||||
});
|
||||
|
||||
// Set the dialog title
|
||||
builder.setTitle(title)
|
||||
.setMessage(message)
|
||||
.setView(view)
|
||||
.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, id) -> {
|
||||
// Send the positive button event back to the host activity
|
||||
listener.onDialogPositiveClick(this.appliedTags);
|
||||
})
|
||||
.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, id) -> {
|
||||
// Send the negative button event back to the host activity
|
||||
listener.onDialogNegativeClick();
|
||||
});
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void applyChangeToVariable(boolean isChecked, String tagId) {
|
||||
if (isChecked) {
|
||||
this.registeredTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.add(tag));
|
||||
} else {
|
||||
this.appliedTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.remove(tag));
|
||||
}
|
||||
}
|
||||
|
||||
private CompletableFuture<ArrayList<DocumentTagApplyTagDialogExtendedModel>> getDocumentTagArrayList(String documentId) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList = new ArrayList<>();
|
||||
setRegisteredTagList().thenRun(() -> setAppliedTagList(documentId).join()).thenAccept(Void -> {
|
||||
logger.debug("getDocumentTagArrayList", "this.registeredTags.size(): " + this.registeredTags.size());
|
||||
logger.debug("getDocumentTagArrayList", "this.appliedTags.size(): " + this.appliedTags.size());
|
||||
|
||||
documentTagArrayList.addAll(this.registeredTags.stream().map(tag -> {
|
||||
DocumentTagApplyTagDialogExtendedModel documentTag = new DocumentTagApplyTagDialogExtendedModel(
|
||||
new DocumentTag(tag.getId(), tag.getName(), tag.getColor()),
|
||||
this.appliedTags.stream().anyMatch(appliedTag -> appliedTag.getId().equals(tag.getId()))
|
||||
);
|
||||
return documentTag;
|
||||
}).collect(Collectors.toCollection(ArrayList::new)));
|
||||
|
||||
}).join();
|
||||
return documentTagArrayList;
|
||||
});
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> setRegisteredTagList() {
|
||||
return CompletableFuture.runAsync(() -> {
|
||||
this.registeredTags = new ArrayList<>();
|
||||
this.lacertaLibrary.getTagList().thenAccept(documentTagList -> {
|
||||
for (int i = 0; i < documentTagList.size(); i++) {
|
||||
this.registeredTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
|
||||
}
|
||||
}).join();
|
||||
});
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> setAppliedTagList(String documentId) {
|
||||
return CompletableFuture.runAsync(() -> {
|
||||
this.appliedTags = new ArrayList<>();
|
||||
this.lacertaLibrary.getAppliedTagList(documentId).thenAccept(documentTagList -> {
|
||||
for (int i = 0; i < documentTagList.size(); i++) {
|
||||
this.appliedTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
|
||||
}
|
||||
}).join();
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,87 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
public class LacertaCreateTagDialog extends DialogFragment {
|
||||
|
||||
private String title;
|
||||
|
||||
private String message;
|
||||
|
||||
private String positiveButtonText;
|
||||
|
||||
private String negativeButtonText;
|
||||
|
||||
private LacertaCreateTagDialogListener listener;
|
||||
|
||||
// Setter
|
||||
|
||||
public LacertaCreateTagDialog setListener(LacertaCreateTagDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_create_tag, null);
|
||||
|
||||
// TextEdit
|
||||
EditText tag_name_edit_text = view.findViewById(R.id.tag_name_edit_text);
|
||||
com.google.android.material.textfield.TextInputLayout tag_name_text_input_layout = view.findViewById(R.id.tag_name_text_input_layout);
|
||||
tag_name_text_input_layout.setHint("タグの名前");
|
||||
EditText tag_color_edit_text = view.findViewById(R.id.tag_color_edit_text);
|
||||
com.google.android.material.textfield.TextInputLayout tag_color_text_input_layout = view.findViewById(R.id.tag_color_text_input_layout);
|
||||
tag_color_text_input_layout.setHint("タグの色(カラーコード)");
|
||||
|
||||
builder.setTitle(this.title == null ? "Create new tag" : this.title);
|
||||
|
||||
// Button
|
||||
builder.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, which) -> {
|
||||
String tag_name = tag_name_edit_text.getText().toString();
|
||||
String tag_color = tag_color_edit_text.getText().toString();
|
||||
if (listener != null) {
|
||||
listener.onPositiveClick(tag_name, tag_color);
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onNegativeClick();
|
||||
}
|
||||
});
|
||||
|
||||
builder.setView(view);
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaCreateTagDialogListener {
|
||||
|
||||
void onPositiveClick(String tag_name, String tag_color);
|
||||
|
||||
void onNegativeClick();
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public class LacertaEditMetaDialog {
|
||||
}
|
||||
@ -0,0 +1,163 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaSelectDirDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
private LacertaSelectDirDialogListener listener;
|
||||
|
||||
private String title;
|
||||
|
||||
private String message;
|
||||
|
||||
private String positiveButtonText;
|
||||
|
||||
private String negativeButtonText;
|
||||
|
||||
private SelectDirDialogItemAdapter adapter;
|
||||
|
||||
private RecyclerView recyclerView;
|
||||
|
||||
private TextView current_dir_text_view;
|
||||
|
||||
// Setter
|
||||
|
||||
public LacertaSelectDirDialog setListener(LacertaSelectDirDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_select_dir, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
this.recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
||||
this.current_dir_text_view = view.findViewById(R.id.current_dir_text_view);
|
||||
|
||||
this.adapter = new SelectDirDialogItemAdapter(new LacertaSelectDirDialogInternalEventListener() {
|
||||
@Override
|
||||
public void onDirSelected(String name, String itemId) {
|
||||
showRecyclerViewItem(itemId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackSelected(String parentId) {
|
||||
showRecyclerViewItem(parentId);
|
||||
}
|
||||
});
|
||||
|
||||
this.recyclerView.setAdapter(this.adapter);
|
||||
builder.setView(view);
|
||||
|
||||
showRecyclerViewItem(null); // get root folder
|
||||
|
||||
builder.setTitle(this.title == null ? "Select a directory" : this.title);
|
||||
builder.setMessage(this.message == null ? "Select a directory" : this.message);
|
||||
builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onDirSelected(
|
||||
adapter.getCurrentPageTitle() == null ? null : adapter.getCurrentPageTitle(),
|
||||
adapter.getCurrentId() == null ? null : adapter.getCurrentId());
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(this.negativeButtonText == null ? "Cancel" : this.negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onCanceled();
|
||||
}
|
||||
});
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void showRecyclerViewItem(String targetDirId) {
|
||||
lacertaLibrary.getPublicPath(targetDirId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
if (publicPath != null) {
|
||||
current_dir_text_view.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPathの実装を修正する
|
||||
} else {
|
||||
current_dir_text_view.setText("/");
|
||||
}
|
||||
});
|
||||
});
|
||||
lacertaLibrary.getFolderList(targetDirId).thenAccept(libraryItemPage -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
int currentCount = adapter.getItemCount();
|
||||
String currentDirId = adapter.getCurrentId();
|
||||
if (currentDirId == null) {
|
||||
// Rootが関わる推移 (Rootからの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() == null) {
|
||||
// Rootが関わる推移 (Rootへの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() != null) {
|
||||
// Rootが関わらない推移
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(1, currentCount);
|
||||
adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
|
||||
} else {
|
||||
// その他の遷移(安全側に倒すため全アイテム更新)
|
||||
logger.warn("LacertaSelectDirDialog", "Unknown transition.");
|
||||
logger.warn("LacertaSelectDirDialog", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectDirDialogInternalEventListener {
|
||||
void onDirSelected(String name, String itemId);
|
||||
void onBackSelected(String parentId);
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectDirDialogListener {
|
||||
|
||||
void onDirSelected(String name, String itemId);
|
||||
void onCanceled();
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaSelectRevDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
String title;
|
||||
String documentId;
|
||||
String message;
|
||||
String negativeButtonText;
|
||||
|
||||
LacertaSelectRevDialogListener listener;
|
||||
|
||||
public LacertaSelectRevDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setDocumentId(String documentId) {
|
||||
this.documentId = documentId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setListener(LacertaSelectRevDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_select_rev, null);
|
||||
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.select_rev_recycler_view);
|
||||
|
||||
SelectRevDialogItemAdapter adapter = new SelectRevDialogItemAdapter(revId -> {
|
||||
if (listener != null) {
|
||||
listener.onItemSelected(revId);
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||
builder.setView(view);
|
||||
|
||||
if (this.documentId == null) {
|
||||
logger.error("SelectRevDialog", "documentId is null");
|
||||
logger.e_code("0296fb0c-07a3-4971-a280-bd1a61461bb7");
|
||||
Toast.makeText(getContext(), "Sorry, something went wrong", Toast.LENGTH_SHORT).show();
|
||||
dismiss();
|
||||
}
|
||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create(this.documentId);
|
||||
lacertaVcs.getRevisionHistory().thenAccept(revList -> {
|
||||
adapter.setRevList(revList);
|
||||
adapter.notifyDataSetChanged(); // TODO-rca:時間に応じてアニメーションをつける
|
||||
});
|
||||
|
||||
|
||||
builder.setTitle(title == null ? "Select Rev" : title);
|
||||
builder.setMessage(message == null ? "Select Rev" : message);
|
||||
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onDialogCanceled();
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectRevDialogInternalListener {
|
||||
|
||||
void onItemSelected(String revId);
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectRevDialogListener {
|
||||
|
||||
void onItemSelected(String revId);
|
||||
|
||||
void onDialogCanceled();
|
||||
}
|
||||
@ -0,0 +1,100 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
public class SelectDirDialogItemAdapter extends RecyclerView.Adapter<SelectDirDialogItemAdapter.SelectDirDialogItemViewHolder> {
|
||||
|
||||
|
||||
private LibraryItemPage libraryItemPage;
|
||||
LacertaSelectDirDialogInternalEventListener listener;
|
||||
|
||||
public SelectDirDialogItemAdapter(LacertaSelectDirDialogInternalEventListener listener) {
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
public void setListItems(LibraryItemPage libraryItemPage) {
|
||||
this.libraryItemPage = libraryItemPage;
|
||||
if (this.libraryItemPage.getPageId() != null) { // ルートディレクトリの場合は戻るボタンを表示しない
|
||||
this.libraryItemPage.getListItems().add(0, new ListItem("戻る", " ", ListItemType.ITEM_TYPE_ACTION_BACK, null));
|
||||
}
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public SelectDirDialogItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||
return new SelectDirDialogItemViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(SelectDirDialogItemViewHolder holder, int position) {
|
||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
||||
holder.title.setText(listItem.getTitle());
|
||||
holder.description.setText(listItem.getDescription());
|
||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||
if(listItem.getItemType() == ListItemType.ITEM_TYPE_ACTION_BACK) {
|
||||
holder.itemView.setOnClickListener(v -> listener.onBackSelected(this.libraryItemPage.getParentId()));
|
||||
} else {
|
||||
holder.itemView.setOnClickListener(v -> listener.onDirSelected(listItem.getTitle(), listItem.getItemId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return this.libraryItemPage == null ? 0 : this.libraryItemPage.getListItems().size();
|
||||
}
|
||||
|
||||
public String getCurrentId() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageId();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getCurrentPageTitle() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageTitle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class SelectDirDialogItemViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
TextView description;
|
||||
|
||||
ImageView icon;
|
||||
|
||||
|
||||
public SelectDirDialogItemViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||
description.setVisibility(View.GONE); // 暫定
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.model.VcsRevModel;
|
||||
|
||||
public class SelectRevDialogItemAdapter extends RecyclerView.Adapter<SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder>{
|
||||
|
||||
ArrayList<VcsRevModel> revList;
|
||||
|
||||
LacertaSelectRevDialogInternalListener listener;
|
||||
|
||||
public SelectRevDialogItemAdapter(LacertaSelectRevDialogInternalListener listener) {
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
public void setRevList(ArrayList<VcsRevModel> revList) {
|
||||
this.revList = revList;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.common_rev_list_item, parent, false);
|
||||
return new SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder holder, int position) {
|
||||
VcsRevModel rev = revList.get(position);
|
||||
holder.title.setText(rev.getCommitMessage());
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||
holder.description.setText(simpleDateFormat.format(rev.getCreatedAt()));
|
||||
holder.revId.setText("RevID: " + rev.getId());
|
||||
|
||||
holder.itemView.setOnClickListener(v -> listener.onItemSelected(rev.getId()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return this.revList == null ? 0 : this.revList.size();
|
||||
}
|
||||
|
||||
public class SelectRevDialogItemViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
TextView description;
|
||||
TextView revId;
|
||||
|
||||
public SelectRevDialogItemViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
title = itemView.findViewById(R.id.rev_item_title);
|
||||
description = itemView.findViewById(R.id.rev_item_detail);
|
||||
revId = itemView.findViewById(R.id.rev_item_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package one.nem.lacerta.component.common.model;
|
||||
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
|
||||
// TODO-rca: クラス名が長すぎ
|
||||
|
||||
/**
|
||||
* DocumentTagを設定するダイアログで使うための拡張モデル
|
||||
* チェックボックスの状態を保持するように
|
||||
*/
|
||||
public class DocumentTagApplyTagDialogExtendedModel extends DocumentTag {
|
||||
|
||||
private boolean isChecked;
|
||||
|
||||
public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag) {
|
||||
super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
|
||||
}
|
||||
|
||||
public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag, boolean isChecked) {
|
||||
super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
|
||||
this.isChecked = isChecked;
|
||||
}
|
||||
|
||||
public boolean getIsChecked() {
|
||||
return isChecked;
|
||||
}
|
||||
|
||||
public void setIsChecked(boolean checked) {
|
||||
isChecked = checked;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,115 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.PublicPath;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaDirPickerDialog extends LacertaFilePickerDialogBase {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaDirPickerDialogListener {
|
||||
void onDirSelected(String name, String dirId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaDirPickerDialogListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaDirPickerDialog setListener(LacertaDirPickerDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
|
||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
||||
TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
|
||||
|
||||
LacertaFilePickerAdapterBase adapter = new LacertaFilePickerAdapterBase();
|
||||
adapter.setListener(new LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener() {
|
||||
@Override
|
||||
public void onItemSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
});
|
||||
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||
|
||||
this.updateList(adapter, null); // ルートディレクトリのリストを表示
|
||||
|
||||
// Init dialog
|
||||
builder.setTitle(this.title == null ? "フォルダを選択" : this.title);
|
||||
builder.setMessage(this.message == null ? "フォルダを選択してください" : this.message);
|
||||
builder.setView(view);
|
||||
builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onDirSelected(
|
||||
adapter.getCurrentPageTitle(),
|
||||
adapter.getCurrentId());
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void updatePublicPath(TextView currentDirTextView, String folderId) {
|
||||
lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
||||
this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
|
||||
});
|
||||
}
|
||||
|
||||
private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
|
||||
lacertaLibrary.getFolderList(folderId).thenAccept(libraryItemPage -> {
|
||||
int currentCount = adapter.getItemCount();
|
||||
String currentId = adapter.getCurrentId();
|
||||
// adapter.setListItems(libraryItemPage);
|
||||
getActivity().runOnUiThread(() -> {
|
||||
this.updateListView(adapter, libraryItemPage, currentCount, currentId);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
public class LacertaFilePickerAdapter extends LacertaFilePickerAdapterBase {
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerAdapterListener extends LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener {
|
||||
void onDocumentSelected(String documentId);
|
||||
void onCombinedDocumentSelected(String documentId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerAdapterListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerAdapter setListener(LacertaFilePickerAdapterListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
|
||||
super.onBindViewHolder(holder, position);
|
||||
if (libraryItemPage.getListItems().get(position).getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
|
||||
if (libraryItemPage.getListItems().get(position).getHasCombined()) {
|
||||
holder.itemView.setOnClickListener(v -> {
|
||||
listener.onCombinedDocumentSelected(libraryItemPage.getListItems().get(position).getItemId());
|
||||
});
|
||||
} else {
|
||||
holder.itemView.setOnClickListener(v -> {
|
||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
||||
listener.onDocumentSelected(listItem.getItemId());
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,127 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaFilePickerDialog extends LacertaFilePickerDialogBase {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerDialogListener {
|
||||
void onFileSelected(String name, String fileId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerDialogListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerDialog setListener(LacertaFilePickerDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
|
||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
||||
TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
|
||||
|
||||
LacertaFilePickerAdapter adapter = new LacertaFilePickerAdapter();
|
||||
adapter.setListener(new LacertaFilePickerAdapter.LacertaFilePickerAdapterListener() {
|
||||
@Override
|
||||
public void onItemSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDocumentSelected(String documentId) {
|
||||
if (listener != null) {
|
||||
dismiss();
|
||||
listener.onFileSelected(documentId, documentId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCombinedDocumentSelected(String documentId) {
|
||||
if (listener != null) {
|
||||
LacertaFilePickerSelectDocumentDialog dialog = new LacertaFilePickerSelectDocumentDialog();
|
||||
dialog.setDocumentId(documentId);
|
||||
dialog.setListener(documentId1 -> {
|
||||
dismiss();
|
||||
listener.onFileSelected(documentId1, documentId1);
|
||||
});
|
||||
dialog.show(getParentFragmentManager(), "select_document_dialog");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||
|
||||
this.updateList(adapter, null); // ルートディレクトリのリストを表示
|
||||
|
||||
// Init dialog
|
||||
builder.setTitle(this.title == null ? "ファイルを選択" : this.title);
|
||||
builder.setMessage(this.message == null ? "ファイルを選択してください" : this.message);
|
||||
builder.setView(view);
|
||||
builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
|
||||
dismiss();
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void updatePublicPath(TextView currentDirTextView, String folderId) {
|
||||
lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
||||
this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
|
||||
});
|
||||
}
|
||||
|
||||
private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
|
||||
lacertaLibrary.getLibraryPage(folderId, 100).thenAccept(libraryItemPage -> { // TODO-rca: 100 is a magic number
|
||||
int currentCount = adapter.getItemCount();
|
||||
String currentId = adapter.getCurrentId();
|
||||
// adapter.setListItems(libraryItemPage);
|
||||
getActivity().runOnUiThread(() -> {
|
||||
this.updateListView(adapter, libraryItemPage, currentCount, currentId);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
|
||||
public class LacertaFilePickerSelectDocumentAdapter extends RecyclerView.Adapter<LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder>{
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerSelectDocumentAdapterListener {
|
||||
void onDocumentSelected(String documentId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerSelectDocumentAdapterListener listener;
|
||||
|
||||
ArrayList<ListItem> listItems;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerSelectDocumentAdapter setListener(LacertaFilePickerSelectDocumentAdapterListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setListItems(ArrayList<ListItem> listItems) {
|
||||
this.listItems = listItems;
|
||||
}
|
||||
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||
return new LacertaFilePickerSelectDocumentViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder holder, int position) {
|
||||
ListItem listItem = listItems.get(position);
|
||||
holder.title.setText(listItem.getTitle());
|
||||
holder.description.setVisibility(View.GONE);
|
||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||
holder.itemView.setOnClickListener(v -> listener.onDocumentSelected(listItem.getItemId()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return listItems == null ? 0 : listItems.size();
|
||||
}
|
||||
|
||||
public class LacertaFilePickerSelectDocumentViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
ImageView icon;
|
||||
TextView title;
|
||||
TextView description;
|
||||
|
||||
public LacertaFilePickerSelectDocumentViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,88 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.pref.ToxiDocumentModel;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaFilePickerSelectDocumentDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerSelectDocumentDialogListener {
|
||||
void onDocumentSelected(String documentId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerSelectDocumentDialogListener listener;
|
||||
|
||||
String documentId;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerSelectDocumentDialog setListener(LacertaFilePickerSelectDocumentDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerSelectDocumentDialog setDocumentId(String documentId) {
|
||||
this.documentId = documentId;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_doc, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.document_list_recycler_view);
|
||||
|
||||
LacertaFilePickerSelectDocumentAdapter adapter = new LacertaFilePickerSelectDocumentAdapter();
|
||||
|
||||
adapter.setListener(documentId -> listener.onDocumentSelected(documentId));
|
||||
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||
builder.setTitle("追加先を選択");
|
||||
|
||||
builder.setView(view);
|
||||
|
||||
lacertaLibrary.getCombinedDocumentToxiList(this.documentId).thenAccept(toxiDocumentModels -> {
|
||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||
for (ToxiDocumentModel toxiDocumentModel : toxiDocumentModels) {
|
||||
listItems.add(new ListItem(toxiDocumentModel.titleCache, null, ListItemType.ITEM_TYPE_DOCUMENT, toxiDocumentModel.childDocumentId));
|
||||
}
|
||||
adapter.setListItems(listItems);
|
||||
adapter.notifyDataSetChanged();
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,110 @@
|
||||
package one.nem.lacerta.component.common.picker.base;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
public class LacertaFilePickerAdapterBase extends RecyclerView.Adapter<LacertaFilePickerAdapterBase.LacertaFilePickerViewHolder> {
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerAdapterListener {
|
||||
void onItemSelected(String dirId);
|
||||
void onBackSelected(String dirId);
|
||||
}
|
||||
|
||||
protected LibraryItemPage libraryItemPage;
|
||||
|
||||
protected LacertaFilePickerAdapterListener listener;
|
||||
|
||||
// Empty constructor
|
||||
public LacertaFilePickerAdapterBase() {
|
||||
}
|
||||
|
||||
public void setListItems(LibraryItemPage libraryItemPage) {
|
||||
this.libraryItemPage = libraryItemPage;
|
||||
if (this.libraryItemPage.getPageId() != null) { // ルートディレクトリの場合は戻るボタンを表示しない
|
||||
this.libraryItemPage.getListItems().add(0, new ListItem("戻る", " ", ListItemType.ITEM_TYPE_ACTION_BACK, null));
|
||||
}
|
||||
}
|
||||
|
||||
public void setListener(LacertaFilePickerAdapterListener listener) {
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public LacertaFilePickerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||
return new LacertaFilePickerViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
|
||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
||||
holder.title.setText(listItem.getTitle());
|
||||
holder.description.setText(listItem.getDescription());
|
||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||
if(listItem.getItemType() == ListItemType.ITEM_TYPE_ACTION_BACK) {
|
||||
holder.itemView.setOnClickListener(v -> listener.onBackSelected(this.libraryItemPage.getParentId()));
|
||||
} else {
|
||||
holder.itemView.setOnClickListener(v -> listener.onItemSelected(listItem.getItemId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return this.libraryItemPage == null ? 0 : this.libraryItemPage.getListItems().size();
|
||||
}
|
||||
|
||||
public String getCurrentId() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageId();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getCurrentPageTitle() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageTitle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class LacertaFilePickerViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
TextView description;
|
||||
|
||||
ImageView icon;
|
||||
|
||||
|
||||
public LacertaFilePickerViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||
description.setVisibility(View.GONE); // 暫定
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,88 @@
|
||||
package one.nem.lacerta.component.common.picker.base;
|
||||
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.PublicPath;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
public class LacertaFilePickerDialogBase extends DialogFragment {
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
// Variables
|
||||
protected String title;
|
||||
protected String message;
|
||||
protected String positiveButtonText;
|
||||
protected String negativeButtonText;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerDialogBase setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerDialogBase setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerDialogBase setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerDialogBase setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
// Methods
|
||||
|
||||
protected void updatePathTextView(TextView currentDirTextView, PublicPath publicPath, ListItemType listItemType) {
|
||||
if (publicPath == null) {
|
||||
currentDirTextView.setText("/");
|
||||
} else {
|
||||
if (listItemType == ListItemType.ITEM_TYPE_FOLDER) {
|
||||
currentDirTextView.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
|
||||
} else {
|
||||
currentDirTextView.setText("/" + publicPath.parent().getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void updateListView(LacertaFilePickerAdapterBase adapter, LibraryItemPage libraryItemPage, int currentCount, String currentDirId) {
|
||||
if (currentCount == 0) {
|
||||
// 初回表示
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (currentDirId == null) {
|
||||
// Rootが関わる推移 (Rootからの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() == null) {
|
||||
// Rootが関わる推移 (Rootへの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() != null) {
|
||||
// Rootが関わらない推移
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(1, currentCount);
|
||||
adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
|
||||
} else {
|
||||
// その他の遷移(安全側に倒すため全アイテム更新)
|
||||
logger.warn("FilePickerDialogBase", "Unknown transition.");
|
||||
logger.warn("FilePickerDialogBase", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
}
|
||||
}
|
||||
}
|
||||
15
component/common/src/main/res/layout/apply_tag_list_item.xml
Normal file
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/tag_check_box"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16sp"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:layout_marginVertical="4dp"
|
||||
android:text="CheckBox" />
|
||||
|
||||
</LinearLayout>
|
||||
@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingHorizontal="24dp"
|
||||
android:paddingVertical="16dp">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/item_text_container"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rev_item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16sp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Placeholder Title"
|
||||
android:textColor="@color/colorOnSurface"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rev_item_detail"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:text="2023/01/01 00:00:00 - hogehoge"
|
||||
android:textColor="@color/colorOnSurfaceSecondary"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/rev_item_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rev_item_id"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="12sp"
|
||||
android:text="dd76a029-51f1-40f7-b316-a0c74bbfebb1(Example)"
|
||||
android:textColor="@color/colorOnSurfaceSecondary"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/rev_item_detail" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/apply_tag_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
</FrameLayout>
|
||||
@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tag_name_text_input_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tag_name_edit_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tag_color_text_input_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
|
||||
<!-- todo: add color picker -->
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tag_color_edit_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</LinearLayout>
|
||||
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/title_text_input_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tag_name_edit_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/current_dir_text_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="32dp" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/select_dir_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
|
||||
|
||||
</LinearLayout>
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/document_list_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
|
||||
</FrameLayout>
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/select_rev_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
</FrameLayout>
|
||||
@ -1,10 +1,11 @@
|
||||
plugins {
|
||||
alias(libs.plugins.com.android.library)
|
||||
id 'com.google.dagger.hilt.android'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'one.nem.lacerta.component.scanner'
|
||||
compileSdk 33
|
||||
compileSdk 34
|
||||
|
||||
defaultConfig {
|
||||
minSdk 26
|
||||
@ -29,9 +30,28 @@ 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')
|
||||
|
||||
implementation project(':component:common')
|
||||
}
|
||||
@ -1,4 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<application>
|
||||
<activity
|
||||
android:name=".ScannerManagerActivity"
|
||||
android:exported="false" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@ -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,333 @@
|
||||
package one.nem.lacerta.component.scanner;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.EdgeToEdge;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.core.graphics.Insets;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import androidx.core.view.WindowInsetsCompat;
|
||||
|
||||
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.component.common.picker.LacertaFilePickerDialog;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.page.Page;
|
||||
import one.nem.lacerta.processor.DocumentProcessor;
|
||||
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
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;
|
||||
|
||||
// @Inject
|
||||
// public ScannerManagerActivity(LacertaLogger logger, Document document, LacertaLibrary lacertaLibrary, DocumentProcessorFactory documentProcessorFactory, LacertaVcsFactory lacertaVcsFactory) {
|
||||
// this.logger = logger;
|
||||
// this.document = document;
|
||||
// this.lacertaLibrary = lacertaLibrary;
|
||||
// this.documentProcessorFactory = documentProcessorFactory;
|
||||
// this.lacertaVcsFactory = lacertaVcsFactory;
|
||||
// }
|
||||
|
||||
@Inject
|
||||
public ScannerManagerActivity() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
// Variables
|
||||
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||
|
||||
private boolean update = false;
|
||||
private String documentId;
|
||||
private int index = 0;
|
||||
|
||||
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
|
||||
);
|
||||
|
||||
DocumentScanner documentScannerUpdate = new DocumentScanner( // TODO-rca: ひどすぎるのでなんとかする
|
||||
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);
|
||||
updatePage();
|
||||
return null;
|
||||
},
|
||||
(errorMessage) -> {
|
||||
// an error happened
|
||||
logger.error(TAG, "Error: " + errorMessage);
|
||||
logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
|
||||
finish();
|
||||
return null;
|
||||
},
|
||||
() -> {
|
||||
// user canceled document scan
|
||||
logger.debug(TAG, "User canceled document scan");
|
||||
finish();
|
||||
return null;
|
||||
},
|
||||
null,
|
||||
null,
|
||||
1
|
||||
);
|
||||
|
||||
|
||||
@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;
|
||||
});
|
||||
|
||||
|
||||
|
||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
|
||||
!= PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, 1); // TODO-rca: リクエストコードを定数にする
|
||||
}
|
||||
|
||||
|
||||
MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
|
||||
setSupportActionBar(toolbar);
|
||||
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
||||
|
||||
Intent intent = getIntent();
|
||||
Bundle bundle = intent.getExtras();
|
||||
if (bundle != null) {
|
||||
update = bundle.getBoolean("update", false);
|
||||
documentId = bundle.getString("documentId");
|
||||
index = bundle.getInt("index", 0);
|
||||
}
|
||||
if (this.update) {
|
||||
documentScanner = documentScannerUpdate;
|
||||
}
|
||||
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) {
|
||||
// 新ドキュメントとして保存
|
||||
saveNewDocument();
|
||||
return true;
|
||||
}
|
||||
else if (item.getItemId() == R.id.action_insert_exist) {
|
||||
// 既存ドキュメントに挿入
|
||||
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");
|
||||
} 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, "Initial Commit").join();
|
||||
document.updateDocument(documentDetail).join();
|
||||
dialog.dismiss();
|
||||
finish();
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps, String commitMessage) {
|
||||
return CompletableFuture.runAsync(() -> {
|
||||
try {
|
||||
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
|
||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(commitMessage == null ? "NONE" : commitMessage);
|
||||
} catch (Exception e) {
|
||||
logger.error(TAG, "Error: " + e.getMessage());
|
||||
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void updatePage() {
|
||||
logger.debug(TAG, "updatePage");
|
||||
// Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
|
||||
ProgressDialog dialog = new ProgressDialog(this);
|
||||
dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
|
||||
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
|
||||
dialog.setCancelable(false);
|
||||
dialog.show();
|
||||
document.getDocument(documentId).thenAccept((documentDetail) -> {
|
||||
DocumentProcessor documentProcessor = documentProcessorFactory.create(documentDetail);
|
||||
if (croppedImages.size() != 1) {
|
||||
logger.error(TAG, "croppedImages.size() != 1");
|
||||
logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
|
||||
return;
|
||||
}
|
||||
if (croppedImages.get(0) == null) {
|
||||
logger.error(TAG, "croppedImages.get(0) == null");
|
||||
logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
|
||||
return;
|
||||
}
|
||||
documentProcessor.updatePageAtIndex(croppedImages.get(0), index);
|
||||
document.updateDocument(documentProcessor.getDocumentDetail()).join();
|
||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(index + "ページ目を更新"); // TODO-rca: メッセージを動的にする, 指定できるようにする
|
||||
dialog.dismiss();
|
||||
});
|
||||
}
|
||||
|
||||
private void insertToExistDocument() {
|
||||
logger.debug(TAG, "insertToExistDocument");
|
||||
LacertaFilePickerDialog dialog = new LacertaFilePickerDialog();
|
||||
dialog.setListener(((name, fileId) -> {
|
||||
document.getDocument(fileId).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();
|
||||
finish();
|
||||
});
|
||||
}));
|
||||
dialog.setTitle("追加するドキュメントを選択");
|
||||
dialog.show(getSupportFragmentManager(), "LacertaFilePickerDialog");
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
selectedImage.setImageBitmap(resultImages.get(0));
|
||||
}
|
||||
|
||||
}
|
||||
@ -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);
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
package one.nem.lacerta.component.scanner;
|
||||
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.constraintlayout.utils.widget.ImageFilterView;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.websitebeaver.documentscanner.DocumentScanner;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link ScannerScanFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class ScannerScanFragment extends Fragment {
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
// private static final String MAX_SCAN_COUNT = "max_scan_count"; // 規定値
|
||||
|
||||
// TODO: Rename and change types of parameters
|
||||
private String mParam1;
|
||||
|
||||
|
||||
public ScannerScanFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static ScannerScanFragment newInstance(String param1) {
|
||||
ScannerScanFragment fragment = new ScannerScanFragment();
|
||||
Bundle args = new Bundle();
|
||||
// args.putString(MAX_SCAN_COUNT, param1);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
// mParam1 = getArguments().getString(MAX_SCAN_COUNT);
|
||||
// scan(Integer.parseInt(mParam1));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public DocumentScanner getDocumentScanner() {
|
||||
return new DocumentScanner(
|
||||
this,
|
||||
(croppedImageResults) -> {
|
||||
// display the first cropped image
|
||||
croppedImageView.setImageBitmap(
|
||||
BitmapFactory.decodeFile(croppedImageResults.get(0))
|
||||
);
|
||||
return null;
|
||||
},
|
||||
(errorMessage) -> {
|
||||
// an error happened
|
||||
return null;
|
||||
},
|
||||
() -> {
|
||||
// user canceled document scan
|
||||
return null;
|
||||
},
|
||||
null,
|
||||
null,
|
||||
null
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
package one.nem.lacerta.component.scanner;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link ScannerScanResultFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class ScannerScanResultFragment extends Fragment {
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
private static final String ARG_PARAM1 = "param1";
|
||||
private static final String ARG_PARAM2 = "param2";
|
||||
|
||||
// TODO: Rename and change types of parameters
|
||||
private String mParam1;
|
||||
private String mParam2;
|
||||
|
||||
public ScannerScanResultFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
/**
|
||||
* Use this factory method to create a new instance of
|
||||
* this fragment using the provided parameters.
|
||||
*
|
||||
* @param param1 Parameter 1.
|
||||
* @param param2 Parameter 2.
|
||||
* @return A new instance of fragment ScannerScanResultFragment.
|
||||
*/
|
||||
// TODO: Rename and change types and number of parameters
|
||||
public static ScannerScanResultFragment newInstance(String param1, String param2) {
|
||||
ScannerScanResultFragment fragment = new ScannerScanResultFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString(ARG_PARAM1, param1);
|
||||
args.putString(ARG_PARAM2, param2);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_scanner_scan_result, container, false);
|
||||
}
|
||||
}
|
||||
@ -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>
|
||||
@ -1,133 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<androidx.constraintlayout.utils.widget.ImageFilterView
|
||||
android:id="@+id/cropped_image_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toTopOf="@+id/linear_layout_buttons">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_margin="12dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:text="Saturation" />
|
||||
|
||||
<SeekBar
|
||||
android:id="@+id/seekBar_saturation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:max="200"
|
||||
android:progress="100"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_margin="12dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:text="Contrast" />
|
||||
|
||||
<SeekBar
|
||||
android:id="@+id/seekBar_contrast"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:max="200"
|
||||
android:progress="100"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_margin="12dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:text="Brightness" />
|
||||
|
||||
<SeekBar
|
||||
android:id="@+id/seekBar_brightness"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:max="200"
|
||||
android:progress="100"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_margin="12dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:text="Warmth" />
|
||||
|
||||
<SeekBar
|
||||
android:id="@+id/seekBar_warmth"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:max="500"
|
||||
android:progress="100"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linear_layout_buttons"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_save_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:insetLeft="12dp"
|
||||
android:insetRight="12dp"
|
||||
android:text="Save Image" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_kill_me"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:insetLeft="12dp"
|
||||
android:insetRight="12dp"
|
||||
android:text="Kill me" />
|
||||
</LinearLayout>
|
||||
|
||||
</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/description_24px"
|
||||
android:title="Insert"
|
||||
app:showAsAction="ifRoom"/>
|
||||
</menu>
|
||||
@ -1,10 +1,11 @@
|
||||
plugins {
|
||||
alias(libs.plugins.com.android.library)
|
||||
id 'com.google.dagger.hilt.android'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'one.nem.lacerta.component.viewer'
|
||||
compileSdk 33
|
||||
compileSdk 34
|
||||
|
||||
defaultConfig {
|
||||
minSdk 26
|
||||
@ -29,7 +30,39 @@ 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')
|
||||
|
||||
implementation project(':vcs')
|
||||
|
||||
implementation project(':component:common')
|
||||
|
||||
// TODO-rca: バージョンカタログに切り出す
|
||||
implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
|
||||
|
||||
// ViewPager2
|
||||
implementation "androidx.viewpager2:viewpager2:1.0.0"
|
||||
|
||||
implementation project(':component:scanner') // めちゃくちゃよくないけどもう正しくやってる時間がないので
|
||||
}
|
||||
@ -1,4 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<application>
|
||||
<activity
|
||||
android:name=".ViewerMainActivity"
|
||||
android:exported="false" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||