diff --git a/build.gradle b/build.gradle index 384553a2..8ef57df9 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ plugins { id 'com.android.library' version '8.7.3' apply false id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false id "org.jetbrains.kotlin.kapt" version "$kotlinVersion" apply false - id "com.diffplug.spotless" version "6.25.0" apply false + id "com.diffplug.spotless" version "7.0.0" apply false id 'io.gitlab.arturbosch.detekt' version '1.23.7' apply false id 'com.android.application' version '8.7.3' apply false } diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index baf29c62..6ec4b612 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -3,7 +3,6 @@ uid Jake Wharton sub CF771F914C2A4A73 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBE2fCWARBAC3v9wYo5kmynmVP+43ccamidflSLQjjpsXpSDLPFokGxeuw0OC QJy46m8b5ACoCqRlfwnRRcEHxiSlaBATJA6hi7NRO41R39C62JXsIxNJR16JNQ5k @@ -35,7 +34,6 @@ pub 84E913A8E3A748C0 uid The Legion of the Bouncy Castle Inc. (Maven Repository Artifact Signer) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGR/8HUBDADJ+V5VgTXFG4xVI/1r07a/pTXoAQhHyJMkVdFScGARsps07VXI IsYgPsifOFU55E7uRMZPTLAx5F1uxoZAWGtXIz0d4ISKhobFquH8jZe7TnsJBJNV @@ -56,7 +54,6 @@ uid J. Daniel Kulp sub 594E23256A36A392 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBEqQOcwBEACdPSfBAkHm1b2GdOjB3gGerx/JDn3zYNnNpcQrM8Do0bxDwlfT qwLA0P9ju4mzTfHU5kEvm2lrXz8QCZPLe9eY6GxzzSbeXtt+4fP84/YGmsK6DQTy @@ -101,7 +98,6 @@ uid Marc Philipp sub 8B2A34A7D4A9B8B3 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw @@ -146,7 +142,6 @@ uid Jesse Wilson sub 51F5B36C761AA122 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFoQh54BEADOuivAfgGKc4/zDwx+AwJdctjTT0znL9knRTYG6ediv2Eq+CXm gBM9m5twl+qhUB1NtrdHb4BH49VY9/gHr3JDyo5ewu96qkbeQl4pxW0zmHg/yJx7 @@ -191,7 +186,6 @@ uid Gary David Gregory (Code signing key) sub 59BA7BFEAD3D7F94 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk @@ -220,7 +214,6 @@ uid Olivier Lamy sub 1AFEC329B615D06C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ @@ -253,7 +246,6 @@ uid Thomas Broyer sub FF59C22B07640A16 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE//SjoBCADao3lh/I96fWIY2ZU49ljtHR4Vnzmifm3URFNuv/c8McWGxxCy Y1+oolgVuJcy4hCqcgbkwTiAfBhjZSmsC1QK/2Vs1awFzGccPcgTBakFw/TUav12 @@ -280,7 +272,6 @@ CqZ5vSc= pub 928B20E9AD5298CC sub 0AA3E5C3D232E79B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF04lUwBEAC0RF88RYNbBpBPj/tVG7R+jfMeuVm0Q7hpFtMH3XWpg8um9lPa yLkyIk4LJ3feiCc2QJ15Gu82YXBnbHf+Kn7S5hc/sIqnF+Xz3rcfHkOIYRQGxiq6 @@ -336,7 +327,6 @@ uid Antoine Mottier sub C327DD2B96A50E1C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF6WyHgBEADOrbvGGDYVckFcUofqKiYrBneClFJH1ANheF+KIekmnFV2SH1Z RS2rw12IbpCjwqjhFTMWH2UTLF6pAsSGIufTrSVUAF2WxHw84Y60KmwuYayJCVd3 @@ -379,7 +369,6 @@ ld2takfefAHfookOb0HbBH7aOiIx4D0GgGqmYtjme81xWF4n pub 995EFBF4A3D20BEB sub B89991D171A02F5C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF9amNkBEADKyJj5snYd8bZpONpu1QHf7c/TK9HxcMzGZaIv9QzViX6CtEHb 2Q2x6ejXQ2frECMrvns5JAJd21B6215EhlOqrHSMkTrQ6fvOIfWd0huZ0QHr4FME @@ -421,7 +410,6 @@ bD6Qc/aECwy4BBgcKw3t/PVHKOE7RUjO/QWG6CIej/nl7O0g91NtlEY= pub 9A259C7EE636C5ED sub D66472CF54179CC4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFKD+PgBEAC8IkWujQlmU0/7+QPZFsc/z/rXgg7BQyo330QK4HeMzeCK6WHa SWzVDM9h6nFDs6Xln6YexbZUjLsxS/a/Ox2i26Qg8B+NghgiratbdJsByRrU/3la @@ -463,7 +451,6 @@ DG71mmILRI1wVgrDp5mFKeV/d20uMvMq pub 9C4F7E9D98B1CC53 sub 32E3DF6FC5E91334 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBEzDDl0BEADHvJW2uff8vfxbfy0IvNOK4aytU+HVEvKEmuSqYEzC8i3BF6RT LOxTeRFlu92rYz5ypD0mdNCzQaH0xbkcjialP6FpPCByrM9fFv6hmxZFSY71rvqz @@ -507,7 +494,6 @@ uid Slawomir Jaranowski sub E3F6790A5A167F5A -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGHDIagBEADpzdCwVjVlHuo8qpu9HtmqNpEW4TB7y6+NX7Q39mj8w+iVskE1 sL0+BOCdP6ZMiQziWbOQ2FxCd3mD0ixZ7v1i7+0jowySPacJbVNaPPECP38gDte4 @@ -552,7 +538,6 @@ uid DiffPlug LLC sub 030DD9087C31C9AF -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGPAYVUBDADCs9PkY8zzhzE38bRZX+vTrr3LdChGNBmObV858NGRrXeZtyLu U7YwYVF7w2vHUI/JQWrlPZc5tBFicefucfUtKt790WzAk3NBjGtX4IWpG57C1Z5t @@ -587,7 +572,6 @@ Q/IKL5Iy5doINK/iyjb/G/JLH1/TkhW9zEheiKUY6TiXeR3p pub A2115AE15F6B8B72 sub 6366592024774157 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ 5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82 @@ -612,7 +596,6 @@ KrnduWWXAJ9Adm9Mz4yoxrosHSkp5BWzXBUt4A== pub A41F13C999945293 sub 8183E80D264EE073 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBE8YNGIBEADEgcfvs8TL3X2Ql62HJ6SrXWAOoHw5CquJxUQkvBGesIT1Hk24 exiPwrlNE1qUjbVlef1Cwk9ZfwMOpJdfP2MQQbx0nxxqv+JtsoeXUy9bTSvZYBUL @@ -654,7 +637,6 @@ WD8lsvbx6avD2hwf9dvyqWO2sHjbmWE+Rn8VpJgXWVvXdM0hFPWrUzI= pub A6ADFC93EF34893E sub 9C4C23E6FFE405BD -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE+xZxIBCACzKctn4ez8xOC0pGThhAwjYWGkzcwK4HNaC1usHThBFz3/t8JN OqUXRixLyi5wELN6GHlsGVUQS3IfB4JtuhScsieSB8PTree68/knMq6JI08mJqZr @@ -682,7 +664,6 @@ uid Egor Andreevici sub 1A94B14C6A03458D -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGI8r9sBEACZJBV2TNUSsLRo89uC4lfmQxfNDqkE0uZghfFY/p0fr6fkBybO WDkPFskAPD32fzrWxZd2kkyCRyUrOmAUC22q8hw96t28+RqZymvetIa0f8GQGgkO @@ -725,7 +706,6 @@ R2u/WbxTrhDdrrjoFCFo/ZoYzRY46LR+HdytaEmE pub B0F3710FA64900E7 sub 7892707E9657EBD4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7 @@ -753,7 +733,6 @@ uid Checker Framework (Official Release) sub 700E4F39BC05364B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFhaXO0BEAC8WCdwrJNF/W+C8m9FYwAhEvKBvQ7xmoGYZqgcYe2ntT8udvgZ k+dRwZJnu1VI3a8feOLrAmeNI2MxPP0+l2kGeC55c10duXPzLvW9oHONm39FZpCM @@ -891,10 +868,34 @@ IprKXtD8103BdNqrPJev2azwqWwxFpN83tEPbK4SwWPgk1nSELXZZ5ClcDgqatg+ =uOQ4 -----END PGP PUBLIC KEY BLOCK----- +pub BAC30622339994C4 +sub FC9BDC25FB378008 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFlMExYBCACmdTDSXPwSJeYbfYvHoDl5C7vx/0+LOTunDGJN38pNQHYQAZnv +Gyoc9ZmChrhLoim7z4ILqmNo8eegknepQ3dGdUij4NVIhR+m+8irayTbsNHvo3UG +9y7eM5tTSjyNYkyk5fAVuT7OhzIzMA+qtc3GRVxNYRKnaHajt+pOSqr+uoDtMG3n +6eAMHCAnhgh5Nd+dCFcNT+syl3zCwolA1wrzGxxOaif+xi5wwXjmF/lAt4PDIuDT +etA2/AqPM4zAC0BtC0iqVgVypjFV3EAexm/g0LNMiG/M/krzwjPq5gf1DY/57jU0 +02FpKd79HmR7bHdc4e2olEf9NlHxfbPXDDsHABEBAAG5AQ0EWUwTFgEIANmMpV3N +K8aLrLgQTyh5++det8C3D3T5tkEdljHOuN31/qdKNge8H6uKH8zXRZsj5pd8adpW +kD4TzIMvzIwzizsGw34O9hf1E2XPoDqvQr39p1sovX3PeDvRJY/7JFNt9DsphVc3 +xWQfNkC7JdMPa6JRiFHd3ynfbQ+wplf4tfaDVn1JXAWp0NSGgMtXfn5i19hHQWjm +RNAKNQLdVn8UczI8XdVM7bS4giDpQMukSyjsjgAo466iRK2+8f8BwIRe1JRvF37B +dnbvTg/dzoi1/E4ukwVJD6YE2LlDwzdGno9KxPlRsuY3nnheVgjbrGJ2XKRJkIk8 +7cMGh41VKw6L4usAEQEAAYkBHwQYAQIACQUCWUwTFgIbDAAKCRC6wwYiM5mUxEiH +CACQViGOHi0BoZ78ZJz6L48YNMx8fSdSv3YJ83Ih1n5DWCJgrDV5S3/edYinkoVI +0Lusy3MdftRg6OWaYOuOTf6MYcddO/mY363jiMByf9Uh3Dqq4sKqVLRnZbAqgD1o +dRoj2NkEQfgEH/H4JRVrxquzAKoWwJh3MhY+kajYJRJyWfc1/Bm3Bj1tcMGlGeIQ +fgWheeMg3kxrxJ9TXPqVi6VVPaPKIU5i8l46S+Wg3uvMs8vC3XzOIvhY6cwguJv9 +UkjZwGDSI952wLqnREMy0gFZ+OAB0qJpYM3nDEekWZP38G80kojnN61tZjRThu9I +i8/b+PwSW+nW3EpQZdLqZtOU +=2H2i +-----END PGP PUBLIC KEY BLOCK----- + pub BCF4173966770193 sub C9F04E6E2DC4F7F8 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4 DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt @@ -920,7 +921,6 @@ IaddzrPZPmaZ8CtzzyB7+JdSNItBB2Sp pub BF984B4145EA13F7 sub 84761D363E7B0FC4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBF7rgogBCADU9OwoEFdIgN5U0JU5pI7s3T1T1LeDMzAQ8l2Hq4jFrhnrjcEA ieDSut1YIv5NTBoZv4CrklaKvvQNUXPvKrFImA4OKhBodKV3wsq2efCATDGa1JAw @@ -946,7 +946,6 @@ lQyC8nl8P5PgkEZ5CHcGymZlpzihR3ECrPJTk39Sb7D3SxCW4WrChV3kVfmLgvc= pub C4C8CB73B1435348 sub EA2A558279B36E6B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFSwGboBEADoHgtdw+OVEAIF1SiRju8QDuhePZbpSgRLrt25AmowHJhOQUI1 EP7+RWoCWW9gWAGas5mGDBxhPw8NgFv1nMUWFAsj0rkViuRD4qpJbChvlqw7YkOq @@ -988,7 +987,6 @@ Pn5Vct+ePgERiEjouAIKInn7+YOf9AFRs29KT63Ajy/6mpYI1t0YGD7INcqEZ97B pub C727D053C4481CF5 sub 29E792953D515FC5 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF8pVB0BDADcwRGpJUDe8eVSlJ0yPQl/CyeYc0RWq2f1seUMQO0xFW1xPIeL IE68D9VdgarA88qDLYesfBqzn57/r/ztj2aLEKt8IRunJzd0w0G2rrgSCZQ8RmzL @@ -1022,7 +1020,6 @@ cR19NEV8Rfs96NyYYUvfC+ro4to0pXe2n4X3BixeaBmNdHWd9YYgXjYxnM4pLyU= pub C92C5FEC70161C62 sub 64863FF4D1BF1809 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEdUhrIRBADCU9cuKc92CWQlZxwtRuSIV/36Qmj264YD+Lix+r1Qe1PqRr1I /MObOo83ulorWigSkx1k81Mnr56NwmIeo2bMhjmgRgf7EG6XEbKdRKfJcJRR1lDV @@ -1054,7 +1051,6 @@ uid Evgeny Mandrikov (CODE SIGNING KEY) sub C59D5D06CF8D0E01 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBE0NT+kBEAD1hzO+dXStXYJj8M6FBn9fxw+grddjM9rqaEgJ2omSdpZZOPBs DRor7v0Rm23Ec17y/7Dd6oR1CvyAeQwhJvNBaAW4LQmUcvvqep4hfkWDhlRvh/QS @@ -1097,7 +1093,6 @@ pxErXLYbiBTqz6AMRaecKwtIO5tbeddiwB4r/p0= pub CE8B1D1D2530EDC5 sub 7ECBD740FF06AEB5 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFuX5CkBEADkTgn4nzuq0lWR+7kFGYLKvmPLjes4j2nmygIafUjVbNmD70gY DPpbSP02HxgicM6xSSqzZuBVxpbcffqjMPXf8LkVX4iWKZtyzLpf34yaojigU3qF @@ -1152,7 +1147,6 @@ uid Deanna sub 5199F3DAE89C332D -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGCtdhoBDADdopjDt4eUNEqLJSw1ZICSR0oq09SOVtJSaSYdF8UiXjBfL1Ds fhTDqSv5pT2a2gLj0OU3tFhWHvINLaKKCjQnHVcFXi2LTxt+XBOjRYkFjHVisbaZ @@ -1187,7 +1181,6 @@ zZsj/fMJ+OIZcAhE7UVae48GpW2kLATxmK01oSzvizIlmN3rVz2EnjOun2iuuEpF pub D364ABAA39A47320 sub 3F606403DCA455C8 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGH0NlsBEACnLJ3vl/aV+4ytkJ6QSfDFHrwzSo1eEXyuFZ85mLijvgGuaKRr c9/lKed0MuyhLJ7YD752kcFCEIyPbjeqEFsBcgU/RWa1AEfaay4eMLBzLSOwCvhD @@ -1229,7 +1222,6 @@ ikmfPIGVw73RF3HXjJ8GVqTkqbo4ZpgTw/7Z3+fAYE/vxquhnpl2HvE= pub D9C565AA72BA2FDD sub 9121AD263441EEDD -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBFrjUQUBDADTMQL/4d9EyVhsO4XBH9wbGWxcEJvsu/HvppN5fY8hpMV0+Cr9 wjAeJ7d9zdFJVB8vPLN7bb5dm6SNyK3KiOugqVgZrQ+ZPTvCCgFbFyEXuZwDiOa1 @@ -1263,7 +1255,6 @@ zU7kkPUpKBx6hHg/zJnwTVAY/g4+Iw6CHwBhw+2/KoMpjQ63VqjwQZ6+VIwdsSCh pub E16AB52D79FD224F sub 5A34A5E06B936F93 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFF/4bYBCADTeOLZiVGNbjlPrwG7UcMl+yXmEqpf9dB1A9cuicH3PWXj0WOb LSzHjzoRvRekEqSUmgoveey1lPuA2qjOUkXY6Kiyx+oLiG0/ObJHUQW2O+tjSQ0R @@ -1293,7 +1284,6 @@ sub 60EB70DDAAC2EC21 sub 3D5839A2262CBBFB sub 9351716690874F25 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF/RX/MBDADSqelDQKobURExWUKALq86yTPMxMasxmDlccKFpk5xjWrryL7z qg4Fnb7IK5fKDtcnTANtOv2hlIli1h131+SmjJdD3qhfly7QoszOpr5izDS+FOCj @@ -1411,7 +1401,6 @@ pub E93671C7272B7B3F uid Rolf Lear (JDOM) (Used to sign JDOM Packages) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFCPD00BCAC4tY8wMQTsCKyII/mMkUDAkXA2cLM47fY1Wn+iohtgtalUdA0v AhGvTdFU6/St35rOKNoyLC7Sy30FBYpAEfMB/x9j/CaQtdtGhaQU0hCvtWGhhS3J @@ -1428,7 +1417,6 @@ uid Niklas Baudy sub 24219A5BAF207160 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFYUO6UBEADL4uFy2EQM2JiXtHPGBjrJpPaXiYpQkDXLvBR4kbUak/xXCpc4 zdewia48wZZ3jH1JOB+p1FBojz4dZFM7EowBS4FGO9jM8xpwxSz3g+gBGlIXYuFz @@ -1473,7 +1461,6 @@ uid Thomas Ball sub E68665C8F91BDE69 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2 @@ -1500,7 +1487,6 @@ AwT14IRCih4oeUsICRfb9e23BVJGWs2x1VvzaIrLsQ== pub EE9E7DC9D92FC896 sub 3B7272A25F20140F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE/oyDcBCACgYsHtmWmtUzqyr/JN+orfJaTl2363qiS+NJ1lt2CNxUWOqldc VcIGyjmzokxTRpGdCFmT1Lh/hzZhcDPLjrtxf+f6njIibt80OiEbX39gjwZRIikd @@ -1528,7 +1514,6 @@ uid David Burstr?m sub 28CFDE1EB61BB6AA -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mDMEYknmAxYJKwYBBAHaRw8BAQdA/xS5rgP6lF5fl8l+rJB1UiF+7KKDse0PmKYp TNBH7si0KkRhdmlkIEJ1cnN0csO2bSA8ZGF2aWQuYnVyc3Ryb21AZ21haWwuY29t @@ -1542,7 +1527,6 @@ xvQy+f/l5tI8AP49K0LLVdCZ3ifAS9oHJLP18KhriSE+JZDYpoA5sWHqAA== pub F0D0AE433308B042 sub 504F10B64E007C78 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFsRgCkBEADaI8lsWsDCfPfT1Vj4h/oY8EoZst/fG9wnMyLvfemLJWGVb20h uRe7vwBHhtczlAeRYtfNzQ1xLKXWNpMfiJNr8PeZVhZyTN7My3JYJZnmQm1MN53l @@ -1586,7 +1570,6 @@ uid Netty Project Bot sub 1C9F436B883DCCF6 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGAhOxEBEADdB5Jy2sSOndOMCTyk8IFIJYPogjXtN7CnyIlqr4jEB5G87TJf m7OxB95aIVS1vSA5ghCm88N1mKtW6jyYjgLFQbbyD9/X3ShVZjh8B2R4atL93SSK @@ -1632,7 +1615,6 @@ uid Christopher Povirk sub B5CB27F94F97173B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO 9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM @@ -1661,7 +1643,6 @@ uid Baptiste Mathus sub 5F68B9B2F1725F16 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFFCLwoBCADxtcGi0nfolr1kGWe3jQ7n18roJFwBs4Q52nx0h4+a8ZGr7/1E 1brakrz3t/cTSZIrhfru8kirP8cJtXBxpd/nCeRrB/4ZtXPUJiGwKx6sVGr0ix6U @@ -1690,7 +1671,6 @@ uid Herve Boutemy sub CB6D56B72FDDF8AA -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5 agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/ @@ -1717,7 +1697,6 @@ zFdp+62yJA== pub 02216ED811210DAA sub 8C40458A5F28CF7B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGADx6IBDADoHin1LGQ8dhnlhfNCBZ3IyXS2NpR1VjmYtHSlh1hGsPcmHuwo 1mLA6JzXF7NuK3Y52pbTr6vz9bAap8Ysjq/3UJeiDbf7FvmO5xAEVUhrpc7AEY7G @@ -1753,7 +1732,6 @@ uid Sonatype, Inc. (Sonatype release key) sub F2E4DE8FA750E060 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEmoKU8RBADEN0Q6AuEWEeddjARAzNXcjEx1WfTbLxW5abiiy7zLEht63mhF kBlbyxEIRnHCSrPLUqY5ROWdyey8MJw+bsQn005RZmSvq2rniXz3MpcyAcYPVPWx @@ -1786,7 +1764,6 @@ uid Norman Maurer sub DECB4AA7ECD68C0E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEoo3BYRBACXE2oGRA58Ml6s+kvfk6n/AJ+5OFeRT/Xelco/cpdxOVF5LkRk yd+vR2+F9ldBlH7CSTCmrdZIN3M3zrcWndrk/OQkCxNWVnE/a1li7L3G9nYr011k @@ -1813,7 +1790,6 @@ sub 6005789E24E5AD1E sub 6A0975F8B1127B83 sub 3FF44D37464BBB7E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBFzy4ngBDAC4mz6ELMWjfJ8GZtolq3E96T7qjfp4J9FxGVxdbJxkEDnn6MTg V8zhD7yeSZcUSvwzPiDlB/b4RYnh+5LjzKHTsrtr9ja0SupuCkVGkMGWeHhpIGV9 @@ -1931,7 +1907,6 @@ uid Eclipse Project for JAXB sub 8118B3BCDB1A5000 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh 9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY @@ -2012,7 +1987,6 @@ uid Paul Holser sub 71499A87DC1FF84B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ 2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi @@ -2045,7 +2019,6 @@ uid Peter Palaga sub 83552A552A0D431C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5 @@ -2074,7 +2047,6 @@ uid Brad Corso sub BF6D15D3F1BF7BCF -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGGNmd8BDADSpbdIfqzkUNAeYlP0nUw/HFU/v+/aydtjUioAi/KxYt2FOMi6 gk1LOJzHBubv8bF79mlN6sXrnq2lV/MuqvN9DrTAQ4u4Dh0pgbLK6jbxDWPGrYIo @@ -2120,7 +2092,6 @@ uid Matthias Bl?sing sub 891E4C2D471515FE -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe 20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube @@ -2167,7 +2138,6 @@ sub CFF46EE3C17E53E9 sub C2148900BCD3C2AF sub 7D1BE4480B61E2A7 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGBP58sBDADYRZmxLOkqrz0QZ/yESRpv7IeHGLqDE1a8QfFtFb14MJCLSAAS 3nMD6Szi9mEjEqYdJURRcMjbUBhePgbhzGa3FYkjAB8lj6IKbu+ogCwVm1S8+caZ @@ -2286,7 +2256,6 @@ uid Brian E Fox (CODE SIGNING KEY) sub AD9CEBA0521B1945 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBEry8yoBEADnhvT3m/zzzuiUKyAeIfnN9CeN0ilQx4P0kFMhyZchRR4Ekb41 iKw7tDL9q+g7xSo3yUT9dKjDWJ3yhDpdAhp6d4y8GAuWqlOu8CQdEHJOKK0yxTzX @@ -2329,7 +2298,6 @@ gMqQQpNoy+5xrNg+uv6po4Jjtidfww== pub 22E44AC0622B91C3 sub BFE9E301CD277BAF -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFpqN94BCACaAb8Afmng1QPu5k5uzLoA1FJnF6Wf31ZU1FzDxHFHLNUYSWN2 Bg6k95QH5ruZ+Z/QOJSoIB+b3htDklyxd8m+G2KsMIqnQs0BaTN18hb3PFyMIknM @@ -2354,7 +2322,6 @@ VZTvAGH69TDqVvdmLsKhtQidSFbes+7ku5tM61P6ggfv5FJQgQk7WEQ= pub 280D66A55F5316C5 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFOOGVgBCACiDwUZOc6943aBGUrxikkfUnsyZfHtF9jihYmA1pSgfsye+JxR oG9QWW9+3qx4L/d4ZEqBftTWpsjyrY7NyMaeXtJEjE0vhiWNehgXB1z4XTJ66zCX @@ -2370,7 +2337,6 @@ uid Tom Ball sub 9DF7F2349731D55B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFYFiMABCADYpblWssqGxbjTwsyroPh48BwdSKl59zbFKoEHDw87NeWq7fik h95RkbdeWsQSvduXWgQZsUDq9cLOkuS/ChAMkAAd3MPp1NMdFmAqS7BX5wU5s5I7 @@ -2397,7 +2363,6 @@ Dw== pub 296CD27F60EED12C sub D95ECEC170500D9F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBFsHC7gBDADlkoJglNVbX9MShcAm6jvS5atCZwWT63gSasObXFxswsJQd1NK qryHNcj9tKBfLbSpMOoHeyyIKDdwdxN+6+N9Hi4hf0j1Ub6deJyI8ace8VERWaxF @@ -2431,7 +2396,6 @@ x/bMv9iz1kdOKxHCq3agJjuBOAF0H5MI/eTLpbySzrh5PAD5/2W6CzkFMpH6a6E= pub 2C7B12F2A511E325 sub 10DA72CD7FBFA159 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS 2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN @@ -2459,7 +2423,6 @@ uid Markus KARG sub D091C8FFA534EDA2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGTNOPIBDACjeIqMmK4jo8NBVVacAwmqnL6H2/ixU/rPg1WEJSJRQbWu0otK Zrs+0tOVuYsQReW5tYUwI8hclSkdO95NC8bM7rlxcO6JSixsjzf2cOXajOAvuLMj @@ -2494,7 +2457,6 @@ ZgMBzI+v/ingWOyKpKqhpZR/50PHA0o23zw8P1BGeQOlr4kFNA== pub 34918B7D3969D2F5 sub 5CE9BCD2ED28F793 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF0vfHYBDADEDPY9ub98c7jQe4yMbPke3A/sxNHnn0WuA9JN880DPs3L7lrv 9VHTOlFXslDNBPYSbgFXH5YlMGg8ZY8bhngjc+Z3dtrCX1cAjUXOnibi7fBFomLB @@ -2528,7 +2490,6 @@ lawcQqnavcHSKD4ItfKVKitKy12yHv9ENTJC45yfTKnJxhj0jVeXdn/0PWPFPRA= pub 36D4E9618F3ADAB5 sub C4935FA8AC763C70 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGGiftwBDAC94Yhhh/5yO8jYFkg01MPnooXKZEPwxAbAg9wn5iM0tHxhEpkU zJVYZ+JYq013+Ldp8Of7A/d6hKTtZ0xwSeY7S/WFykIk6tc0P5j0sfFS3pGPDk+W @@ -2562,7 +2523,6 @@ q/tSGRQHXTwG53qejlUtKI315ZizOhJiniSDx4fZaK2zB9RlZkrnd1Y= pub 379CE192D401AB61 sub 0CFE993CDBE1D0A2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3 Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u @@ -2606,7 +2566,6 @@ uid Lasse Collin sub 5923A9D358ADF744 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBEzEOZIBEACxg/IuXERlDB48JBWmF4NxNUuuup1IhJAJyFGFSKh3OGAO2Ard sNuRLjANsFXA7m7P5eTFcG+BoHHuAVYmKnI3PPZtHVLnUt4pGItPczQZ2BE1WpcI @@ -2734,7 +2693,6 @@ uid Eclipse Project for JAF sub D908A43FB7EC07AC -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78 j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp @@ -2815,7 +2773,6 @@ uid Carl Mastrangelo sub 9B2A1B698A113AAD -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFzwo60BEACg1rgL5jUtKkFE5DiwqJwxzJyJDH00TBSN6ZT+nXh1UxgC9q2h olF9V+2+LV1Jcmnc946xzIMiWLG33QB0NKVCdU5jNuLahOcViQQjNfGXwNzYoNCR @@ -2860,7 +2817,6 @@ uid Drew Hamilton sub 91FCCDE555C64A9F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF42lroBEACWa+RCajazimveyzyVwzq+1Kj8eiJ1XPJXqvIerGOQ6Tx2qeSM 9AkMcfW7HeN6YW3BR/u2s7xe07D6p6c7UjTmiH1v23ELSk0Ou/BNxiTMdTSly77O @@ -2905,7 +2861,6 @@ uid Rob Tompkins sub 3260CB2DEF74135B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFhqdSMBEACmveOOsQrTky8b5M+Cq6lbhqRB4+INnfigxr7+EMpswo4AxYuA Op/YG+G7NU5h6EK6Tj2dVfXga90GYFkehtFRZgOUJUGKPU/53upsbnsWS8qjJD8g @@ -2950,7 +2905,6 @@ uid Michael Schierl (Maven Project Release Key) sub D94994D14B55169B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mDMEY4fp+xYJKwYBBAHaRw8BAQdArb04PVwQKvEhtUEmEu7/aASZivOWgEkZBqX0 Tovwvq+0J1NlYmFzdGlhbiBTYW1wYW9saSA8c3NhbXBhb2xpQGVxdW8uZGV2Prg4 @@ -2995,7 +2948,6 @@ uid Adam Cozzette sub 726F4E5C34CFD750 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF8QwXwBDADKNLAHhjWUqnLYiO+ws3Hy1du6tMvkR3nfsnIDqpCvSjb+3/rI OHSyq8TbaGLLuHOM4K/KvrKgjhTbXQxvx1WR5IpoylcINzI959yAbaywBj6gVQB3 @@ -3031,7 +2983,6 @@ pub 55C7E5E701832382 uid Andrey Somov (SnakeYAML) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mI0EVdDLQQEEAJMtYCaTA56YsP5RzQzPvqVTaR2nZ27qRk36blHB9WmXK+NHpGeH PHgq59mLPVueo2/M5k/fFrCe36jHePP31gYpFtueeYDfsofHwod0WhsHyC7JfG8d @@ -3045,7 +2996,6 @@ pub 571A5291E827E1C7 uid Central Repository sync with maven.java.net (Used for signing artifacts that support syncing maven.java.net with the Central Repository) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp 3mmNlTsU6s9ARn7BtkhIuM5TdbLs+z+okX62h3F0WW3h+CpfIXyKSgl7uWbhZ5G8 @@ -3068,7 +3018,6 @@ uid Eclipse EE4J Project sub 153E7A3C2B4E5118 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFri3Q8BEAC90D8TTu6C05m/eq6HbU8gOHFc+2VJriVmnoyODTlEk/LAsT6h BRok7nzY0LpNUzUREjJy/w80YTOjLs25IFhnqA6mq8BGLjFwjhBPA4piCyhW/Elh @@ -3148,7 +3097,6 @@ uid Joel Orlina (Sonatype, Inc.) sub 2E74CACB6918A897 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBE1VSkkRBACkCgvt26sMi+0X+EOJDMqdK0Sziy06k47LJf1jOg4tTZ2T9QtP OZ8fD+va/O5+q8Kna993jzcO5n0Nv+R/K3+MvUqSmdITshCIjBt3cC0n6FWndGyl @@ -3181,7 +3129,6 @@ uid Tagir Valeev sub 92BD2D0B5B21ABA2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFUBG7QBCADRWXf0Fw05qRhM4cRnGKlOW1ecue1DCxHAtFwoqmAXyTCO+tI0 MEW5SyXUkX6FsWLl6A2y+KgOs669ogzfQ0rnZMEt4HisRp8wpgk3GWR1/9aKYz/c @@ -3207,7 +3154,6 @@ PyudpB+wOcnxI9pFwmZubWMpcir4BqXM1nWbqFd7tcYPre/0JYIUzKCQANB+Rg== pub 5B05CCDE140C2876 sub 9D29AE4A6B50E01F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs @@ -3248,7 +3194,6 @@ uid David P. Baker sub A7CC6488427379A4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFgRFtYBCADud9fmvTI8Dbs+9GcZUIVzxkL84QYHSDxI9fF+sxfAviq1U+YJ a+ZLIW7HsXx8vpn3hqIqAbDxHjrb6MEJ3OWD5Ks7O9Lq7HOhtqAT/mpV3fZmf6pF @@ -3277,7 +3222,6 @@ uid Eric Bruneton sub 0440006D577EAE4B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE7JURcBCADO+9Dc4/JnB+wX+fq+Fr2zUGSPOT6/qjE5kXL4FEbJKsqDSAKG VnbtRrsIUdmNIFQmz71bBDFhRBbrSrkz927k8eUPhYtxE2NmmWSuKgrjF4qviPQv @@ -3304,7 +3248,6 @@ v813ZcA= pub 5F7786DF73E61F56 sub 73F7734B17EC71F4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGEVsM0BEADiZwFLiyjeOLeGS0jAso0pOwUigT9PpwQq7JFAuJP2i9C4Eunc J2HWRdMhnAY12C2MVetSwhI/4QID+rIreB7ooC4xv8sz1PIC30t2oSYtXF4w5DYh @@ -3348,7 +3291,6 @@ uid java_re sub D547B4A01F74AC1E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE3XFIUBCADcj1zw8m1evCgEMqxgOfl6L8y1tsYWsX7tVPvHEkYlXHrdcpkB fGuWPrauvhBmB9sBkFfxzU98Ilz3Xk9pfISYiaMUk9Mk1ZxsCoYPVhxvOSvk5LgS @@ -3377,7 +3319,6 @@ uid Popma Remko sub 0AC07D0BBD11498C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGBVUWMBDACXALXWXSrB2V95lR1L+i+sQsTQt8tCIgX0iX9UZ7Vw2K/lLnLw WYtM3oTxYox4OdgkK9tK6771EdCH5wQtRdUQJjlsBfZDPMiGqmh1jrAxAugEkFyC @@ -3413,7 +3354,6 @@ pub 66B50994442D2D40 uid Square Clippy -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGDoYisBEACqUDZnT4h6ma6XIzdC6KR++uDbR2VKdhCuv0Og/sHEKkm6ZbG0 OFB8tAaQx/WlsoQyf3DlLfUEOGDai875Aqor3fbM+E1hrZbQNfsOySKEE52k7PYe @@ -3435,7 +3375,6 @@ uid Ceki Gulcu sub A1766BE5F812AC2E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mJMEYvEGpBMFK4EEACMEIwQA6knc/2gtbqDhPh5EzrymR4Hwi1Xf2S0aqMopA1zg IeZzBgSfL+4fEfpXL4eAzvrk29jIXSizDEOgFpw3PW3Om1gASxub4Jo6EQrRgOdd @@ -3455,7 +3394,6 @@ pub 6A65176A0FB1CD0B sub EA8543C570FAF804 sub CA890A5FA09CFD80 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY @@ -3523,7 +3461,6 @@ uid Daniel Lemire sub 1723844CF9A045EC -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug @@ -3552,7 +3489,6 @@ uid Colin Decker sub ABE9F3126BB741C1 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw @@ -3589,7 +3525,6 @@ sub 78BD65473CB3BD13 sub 6494C6D6997C215E sub E88979FB9B30ACF2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFcMjNMBEAC6Wr5QuLIFgz1V1EFPlg8ty2TsjQEl4VWftUAqWlMevJFWvYEx BOsOZ6kNFfBfjAxgJNWTkxZrHzDl74R7KW/nUx6X57bpFjUyRaB8F3/NpWKSeIGS @@ -3780,7 +3715,6 @@ CFdXnOdlNV/zT9VvBk/RkV+Tl/Lk4g== pub 79752DB6C966F0B8 sub AC9F6F1991913E30 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEqXMWkRBACnsxVroe9ojc2AnRn/85KJi/Ntsbku5iJ5z72B6I+VGn/b1Xln kuvRJ41RLG13lKVmHtSTq2pajjmAr9jY5gS8nJ3JUES9bG3yKNN1IDswXExfAUJp @@ -3823,7 +3757,6 @@ uid Inderjeet Singh sub C3E640F38D845FA2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFZUsiQBCADGmoidvh3VvXWGdwbAtHPtDPKEebE/MfFVO+QTRbjJxphzKwAt mxHruikafaSTnC9FWizj99e/Yc45YZHcnt5Htmy0a7DSOQXL37rrnieZxg86tYmC @@ -3850,7 +3783,6 @@ domz6nBt2DF400YubAZR pub 7A8860944FAD5F62 sub C189C86B813330C4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBEvxja8BEADAzZOup1X0B12zJsNsDvXVIwmM6bB+uhEsUHoFTvmsEVwRoZtn i7Q0WSFoY+LDxbvC4Bg1+urCrUrstRJYRyF/pMqPYq/HokRlPjtrli/i3mUSd0zN @@ -3892,7 +3824,6 @@ DrxVxHJIMso7y7QkemJxib8JkfFsaOFye3nvehO6ohGnt42hqvBZWke2E/7xC8ds pub 7C25280EAE63EBE5 sub 926DFB2EDB329089 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D @@ -3926,7 +3857,6 @@ sub 0588BC69A286FF16 sub 3967D4EDA591B991 sub 72FF58594F983302 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF+TCd4BDACbIA94MfIWL0SpvZwBddXgx36Lp9GYOWNgGoQCWSvk9vaMrLaI rEll0xnoP98CfBQYrVSAmHDMhSLBCjNB3V1Sdz8GRdOG7HUffF7Cqwbm3Fxo3H/h @@ -4045,7 +3975,6 @@ uid Niall Gallagher (www.npgall.com) sub DC0B7E986BD7398F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN 7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS @@ -4078,7 +4007,6 @@ x1rrD3BL6LwVJtHcfQxuT3IRDnjnYXZAUOVAlQ== pub 7FE9900F412D622E sub AE6B5325E74ED034 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFnyVlkBCACe8zGkIlDV0dUKmk9PWe2Hw8qM9DdPbtpUOpmUOidGY5svQDL3 eqvHk85TbxqFEe3Qbjjt+R+iApFuXy5kmueXTvwCm7nAU+k/pZtPuzHyhDs3iFFH diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dac5a3f6..89e60ac5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -29,7 +29,7 @@ - + @@ -51,7 +51,10 @@ - + + + + @@ -90,7 +93,10 @@ - + + + + @@ -141,7 +147,10 @@ - + + + + @@ -209,6 +218,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -219,6 +252,22 @@ + + + + + + + + + + + + + + + + @@ -253,6 +302,22 @@ + + + + + + + + + + + + + + + + @@ -274,6 +339,14 @@ + + + + + + + + @@ -282,6 +355,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -290,6 +384,14 @@ + + + + + + + + @@ -298,6 +400,14 @@ + + + + + + + + @@ -361,6 +471,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -374,6 +518,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -454,6 +624,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -462,6 +664,14 @@ + + + + + + + + @@ -470,6 +680,14 @@ + + + + + + + + @@ -478,6 +696,14 @@ + + + + + + + + @@ -486,6 +712,14 @@ + + + + + + + + @@ -494,6 +728,14 @@ + + + + + + + + @@ -502,6 +744,14 @@ + + + + + + + + @@ -510,6 +760,14 @@ + + + + + + + + @@ -518,6 +776,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -526,6 +808,14 @@ + + + + + + + + @@ -534,6 +824,14 @@ + + + + + + + + @@ -542,6 +840,14 @@ + + + + + + + + @@ -550,6 +856,14 @@ + + + + + + + + @@ -558,6 +872,14 @@ + + + + + + + + @@ -566,6 +888,14 @@ + + + + + + + + @@ -574,6 +904,14 @@ + + + + + + + + @@ -582,6 +920,14 @@ + + + + + + + + @@ -590,6 +936,14 @@ + + + + + + + + @@ -598,6 +952,14 @@ + + + + + + + + @@ -606,6 +968,14 @@ + + + + + + + + @@ -614,6 +984,14 @@ + + + + + + + + @@ -622,6 +1000,14 @@ + + + + + + + + @@ -630,6 +1016,14 @@ + + + + + + + + @@ -638,6 +1032,14 @@ + + + + + + + + @@ -646,6 +1048,14 @@ + + + + + + + + @@ -683,6 +1093,14 @@ + + + + + + + + @@ -691,6 +1109,14 @@ + + + + + + + + @@ -734,12 +1160,23 @@ + + + + + + + + + + + @@ -809,6 +1246,14 @@ + + + + + + + + @@ -849,6 +1294,14 @@ + + + + + + + + @@ -897,6 +1350,14 @@ + + + + + + + + @@ -987,6 +1448,14 @@ + + + + + + + + @@ -1039,6 +1508,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1047,6 +1537,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1064,6 +1591,9 @@ + + + @@ -1089,6 +1619,9 @@ + + + @@ -1109,6 +1642,9 @@ + + + @@ -1128,6 +1664,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1141,6 +1701,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1154,6 +1746,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1180,25 +1796,122 @@ - - - + + + - - + + - - - + + + - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1210,12 +1923,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1229,6 +1980,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1247,6 +2022,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1271,6 +2070,14 @@ + + + + + + + + @@ -1295,6 +2102,14 @@ + + + + + + + + @@ -1387,6 +2202,14 @@ + + + + + + + + @@ -1395,6 +2218,14 @@ + + + + + + + + @@ -1403,6 +2234,14 @@ + + + + + + + + @@ -1411,6 +2250,14 @@ + + + + + + + + @@ -1419,6 +2266,14 @@ + + + + + + + + @@ -1427,6 +2282,14 @@ + + + + + + + + @@ -1435,6 +2298,14 @@ + + + + + + + + @@ -1451,6 +2322,14 @@ + + + + + + + + @@ -1467,6 +2346,14 @@ + + + + + + + + @@ -1515,6 +2402,14 @@ + + + + + + + + @@ -1523,6 +2418,22 @@ + + + + + + + + + + + + + + + + @@ -1568,6 +2479,14 @@ + + + + + + + + @@ -1608,6 +2527,14 @@ + + + + + + + + @@ -1633,6 +2560,11 @@ + + + + + @@ -1673,6 +2605,14 @@ + + + + + + + + @@ -1698,6 +2638,11 @@ + + + + + @@ -1746,6 +2691,14 @@ + + + + + + + + @@ -1794,6 +2747,14 @@ + + + + + + + + @@ -1842,6 +2803,14 @@ + + + + + + + + @@ -1914,6 +2883,14 @@ + + + + + + + + @@ -1946,6 +2923,14 @@ + + + + + + + + @@ -1978,6 +2963,14 @@ + + + + + + + + @@ -2010,6 +3003,14 @@ + + + + + + + + @@ -2042,6 +3043,14 @@ + + + + + + + + @@ -2074,6 +3083,14 @@ + + + + + + + + @@ -2106,6 +3123,14 @@ + + + + + + + + @@ -2162,6 +3187,14 @@ + + + + + + + + @@ -2194,6 +3227,14 @@ + + + + + + + + @@ -2226,6 +3267,14 @@ + + + + + + + + @@ -2258,6 +3307,14 @@ + + + + + + + + @@ -2290,6 +3347,14 @@ + + + + + + + + @@ -2322,6 +3387,14 @@ + + + + + + + + @@ -2354,6 +3427,14 @@ + + + + + + + + @@ -2426,6 +3507,14 @@ + + + + + + + + @@ -2466,6 +3555,14 @@ + + + + + + + + @@ -2506,6 +3603,14 @@ + + + + + + + + @@ -2554,6 +3659,22 @@ + + + + + + + + + + + + + + + + @@ -2618,6 +3739,14 @@ + + + + + + + + @@ -2634,6 +3763,14 @@ + + + + + + + + @@ -2762,6 +3899,14 @@ + + + + + + + + @@ -2922,6 +4067,14 @@ + + + + + + + + @@ -2954,6 +4107,14 @@ + + + + + + + + @@ -2970,6 +4131,14 @@ + + + + + + + + @@ -3002,6 +4171,14 @@ + + + + + + + + @@ -3018,6 +4195,14 @@ + + + + + + + + @@ -3050,6 +4235,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -3066,6 +4275,14 @@ + + + + + + + + @@ -3098,6 +4315,14 @@ + + + + + + + + @@ -3114,6 +4339,14 @@ + + + + + + + + @@ -3146,6 +4379,14 @@ + + + + + + + + @@ -3162,6 +4403,14 @@ + + + + + + + + @@ -3194,6 +4443,14 @@ + + + + + + + + @@ -3210,6 +4467,14 @@ + + + + + + + + @@ -3226,7 +4491,15 @@ - + + + + + + + + + @@ -3242,6 +4515,14 @@ + + + + + + + + @@ -3274,6 +4555,14 @@ + + + + + + + + @@ -3290,6 +4579,14 @@ + + + + + + + + @@ -3322,6 +4619,14 @@ + + + + + + + + @@ -3338,6 +4643,14 @@ + + + + + + + + @@ -3370,6 +4683,14 @@ + + + + + + + + @@ -3386,6 +4707,14 @@ + + + + + + + + @@ -3418,6 +4747,14 @@ + + + + + + + + @@ -3434,12 +4771,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3469,6 +4982,9 @@ + + + @@ -3476,14 +4992,34 @@ + + + + + + + + + + + + + + + + + + + + @@ -3494,30 +5030,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3528,7 +5220,18 @@ + + + + + + + + + + + @@ -3546,6 +5249,19 @@ + + + + + + + + + + + + + @@ -3628,123 +5344,720 @@ - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3755,25 +6068,45 @@ + + + + + + + + + + + + + + + + + + + + @@ -3782,7 +6115,23 @@ + + + + + + + + + + + + + + + + @@ -3795,9 +6144,18 @@ + + + + + + + + + @@ -3806,16 +6164,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3827,11 +6215,13 @@ + + @@ -3840,20 +6230,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3861,27 +6286,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3901,6 +6429,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3909,22 +6528,81 @@ + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + + + + @@ -3963,10 +6641,21 @@ + + + + + + + + + + + @@ -3988,6 +6677,9 @@ + + + @@ -4002,6 +6694,14 @@ + + + + + + + + @@ -4038,10 +6738,21 @@ + + + + + + + + + + + @@ -4078,6 +6789,9 @@ + + + @@ -4103,6 +6817,9 @@ + + + @@ -4117,41 +6834,383 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4257,19 +7316,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4278,10 +7420,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4290,6 +7522,11 @@ + + + + + @@ -4302,6 +7539,14 @@ + + + + + + + + @@ -4313,9 +7558,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4332,6 +7662,7 @@ + @@ -4342,5 +7673,13 @@ + + + + + + + + diff --git a/sample/src/main/java/com/nextcloud/android/common/sample/MainActivity.kt b/sample/src/main/java/com/nextcloud/android/common/sample/MainActivity.kt index 2db128d8..0e141d53 100644 --- a/sample/src/main/java/com/nextcloud/android/common/sample/MainActivity.kt +++ b/sample/src/main/java/com/nextcloud/android/common/sample/MainActivity.kt @@ -36,11 +36,12 @@ class MainActivity : AppCompatActivity() { try { mainViewModel.color.value = Color.parseColor("#${binding.color.text}") } catch (_: java.lang.IllegalArgumentException) { - Toast.makeText( - this, - "#${binding.color.text} is not a valid color.", - Toast.LENGTH_SHORT - ).show() + Toast + .makeText( + this, + "#${binding.color.text} is not a valid color.", + Toast.LENGTH_SHORT + ).show() } } diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/color/ColorUtil.kt b/ui/src/main/java/com/nextcloud/android/common/ui/color/ColorUtil.kt index 19db05db..48d19696 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/color/ColorUtil.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/color/ColorUtil.kt @@ -21,41 +21,36 @@ import kotlin.math.roundToInt class ColorUtil @Inject - constructor(private val context: Context) { + constructor( + private val context: Context + ) { @ColorInt fun getNullSafeColor( color: String?, @ColorInt fallbackColor: Int - ): Int { - return color.parseColorOrFallback { fallbackColor } - } + ): Int = color.parseColorOrFallback { fallbackColor } @ColorInt fun getNullSafeColorWithFallbackRes( color: String?, @ColorRes fallbackColorRes: Int - ): Int { - return color.parseColorOrFallback { ContextCompat.getColor(context, fallbackColorRes) } - } + ): Int = color.parseColorOrFallback { ContextCompat.getColor(context, fallbackColorRes) } @ColorInt fun getTextColor( colorText: String?, @ColorInt backgroundColor: Int - ): Int { - return colorText.parseColorOrFallback { getForegroundColorForBackgroundColor(backgroundColor) } - } + ): Int = colorText.parseColorOrFallback { getForegroundColorForBackgroundColor(backgroundColor) } @ColorInt fun getForegroundColorForBackgroundColor( @ColorInt color: Int - ): Int { - return if (isDarkBackground(color)) { + ): Int = + if (isDarkBackground(color)) { Color.WHITE } else { ContextCompat.getColor(context, R.color.grey_900) } - } fun isDarkBackground( @ColorInt color: Int @@ -81,13 +76,11 @@ class ColorUtil fun colorToHexString( @ColorInt color: Int - ): String { - return String.format(null, "#%06X", HEX_WHITE and color) - } + ): String = String.format(null, "#%06X", HEX_WHITE and color) @ColorInt - private fun String?.parseColorOrFallback(fallback: () -> Int): Int { - return if (this?.isNotBlank() == true) { + private fun String?.parseColorOrFallback(fallback: () -> Int): Int = + if (this?.isNotBlank() == true) { try { Color.parseColor(this) } catch (e: IllegalArgumentException) { @@ -97,20 +90,18 @@ class ColorUtil } else { fallback() } - } @ColorInt fun adjustOpacity( color: Int, opacity: Float - ): Int { - return Color.argb( + ): Int = + Color.argb( (Color.alpha(color) * opacity).roundToInt(), Color.red(color), Color.green(color), Color.blue(color) ) - } companion object { private const val HSL_SIZE: Int = 3 diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/MaterialSchemesImpl.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/MaterialSchemesImpl.kt index 057d4556..a87adcb0 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/MaterialSchemesImpl.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/MaterialSchemesImpl.kt @@ -13,8 +13,7 @@ import hct.Hct import scheme.SchemeContent import scheme.SchemeTonalSpot -internal class MaterialSchemesImpl : - MaterialSchemes { +internal class MaterialSchemesImpl : MaterialSchemes { override val lightScheme: DynamicScheme override val darkScheme: DynamicScheme diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/ViewThemeUtilsBase.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/ViewThemeUtilsBase.kt index 8ff288ed..7a0c9de5 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/ViewThemeUtilsBase.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/ViewThemeUtilsBase.kt @@ -15,7 +15,9 @@ import com.nextcloud.android.common.ui.util.PlatformThemeUtil import com.nextcloud.android.common.ui.util.extensions.toColorScheme import dynamiccolor.DynamicScheme -open class ViewThemeUtilsBase(private val schemes: MaterialSchemes) { +open class ViewThemeUtilsBase( + private val schemes: MaterialSchemes +) { /** * Scheme for painting elements */ diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt index be237969..d6af058f 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt @@ -63,8 +63,10 @@ import javax.inject.Inject @Suppress("TooManyFunctions") class AndroidViewThemeUtils @Inject - constructor(schemes: MaterialSchemes, private val colorUtil: ColorUtil) : - ViewThemeUtilsBase(schemes) { + constructor( + schemes: MaterialSchemes, + private val colorUtil: ColorUtil + ) : ViewThemeUtilsBase(schemes) { private val dynamicColor = MaterialDynamicColors() fun colorBottomNavigationView(bottomNavigationView: BottomNavigationView) { @@ -128,11 +130,10 @@ class AndroidViewThemeUtils } } - fun getPrimaryColorDrawable(context: Context): Drawable { - return withScheme(context) { scheme -> + fun getPrimaryColorDrawable(context: Context): Drawable = + withScheme(context) { scheme -> ColorDrawable(dynamicColor.primary().getArgb(scheme)) } - } fun colorToolbarMenuIcon( context: Context, @@ -196,20 +197,17 @@ class AndroidViewThemeUtils fun tintPrimaryDrawable( context: Context, @DrawableRes id: Int - ): Drawable? { - return tintDrawable(context, id, ColorRole.PRIMARY) - } + ): Drawable? = tintDrawable(context, id, ColorRole.PRIMARY) @JvmOverloads fun tintDrawable( context: Context, drawable: Drawable, colorRole: ColorRole = ColorRole.PRIMARY - ): Drawable { - return withScheme(context) { scheme: DynamicScheme -> + ): Drawable = + withScheme(context) { scheme: DynamicScheme -> colorDrawable(drawable, colorRole.select(scheme)) } - } @Deprecated( replaceWith = @@ -222,9 +220,7 @@ class AndroidViewThemeUtils fun tintPrimaryDrawable( context: Context, drawable: Drawable? - ): Drawable? { - return drawable?.let { tintDrawable(context, it, ColorRole.PRIMARY) } - } + ): Drawable? = drawable?.let { tintDrawable(context, it, ColorRole.PRIMARY) } @Deprecated( replaceWith = @@ -237,9 +233,7 @@ class AndroidViewThemeUtils fun tintTextDrawable( context: Context, drawable: Drawable? - ): Drawable? { - return drawable?.let { tintDrawable(context, it, ColorRole.ON_SURFACE) } - } + ): Drawable? = drawable?.let { tintDrawable(context, it, ColorRole.ON_SURFACE) } /** * Public for edge cases. For most cases use [tintDrawable] instead @@ -696,11 +690,10 @@ class AndroidViewThemeUtils } @Deprecated("Don't do this, implement custom viewThemeUtils instead") - fun primaryColor(activity: Activity): Int { - return withScheme(activity) { scheme -> + fun primaryColor(activity: Activity): Int = + withScheme(activity) { scheme -> dynamicColor.primary().getArgb(scheme) } - } companion object { private const val ON_SURFACE_OPACITY_BUTTON_DISABLED: Float = 0.38f diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidXViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidXViewThemeUtils.kt index e582cd80..48d517c7 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidXViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidXViewThemeUtils.kt @@ -40,8 +40,7 @@ class AndroidXViewThemeUtils constructor( schemes: MaterialSchemes, private val androidViewThemeUtils: AndroidViewThemeUtils - ) : - ViewThemeUtilsBase(schemes) { + ) : ViewThemeUtilsBase(schemes) { private val dynamicColor = MaterialDynamicColors() fun colorSwitchCompat(switchCompat: SwitchCompat) { diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/ColorRole.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/ColorRole.kt index 8b885782..0042b195 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/ColorRole.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/ColorRole.kt @@ -13,7 +13,9 @@ import dynamiccolor.DynamicScheme /** * Parameter for library methods so that clients can choose color roles without accessing the Scheme directly */ -enum class ColorRole(internal val select: (DynamicScheme) -> Int) { +enum class ColorRole( + internal val select: (DynamicScheme) -> Int +) { PRIMARY({ dynamiccolor.MaterialDynamicColors().primary().getArgb(it) }), ON_PRIMARY({ dynamiccolor.MaterialDynamicColors().onPrimary().getArgb(it) }), PRIMARY_CONTAINER({ dynamiccolor.MaterialDynamicColors().primaryContainer().getArgb(it) }), diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt index 40e6cba3..1efaddb6 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt @@ -30,8 +30,9 @@ import javax.inject.Inject */ class DialogViewThemeUtils @Inject - constructor(schemes: MaterialSchemes) : - ViewThemeUtilsBase(schemes) { + constructor( + schemes: MaterialSchemes + ) : ViewThemeUtilsBase(schemes) { private val dynamicColor = MaterialDynamicColors() fun colorMaterialAlertDialogBackground( diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt index 00af1cd5..2a39918b 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt @@ -50,8 +50,10 @@ import javax.inject.Inject @Suppress("TooManyFunctions") class MaterialViewThemeUtils @Inject - constructor(schemes: MaterialSchemes, private val colorUtil: ColorUtil) : - ViewThemeUtilsBase(schemes) { + constructor( + schemes: MaterialSchemes, + private val colorUtil: ColorUtil + ) : ViewThemeUtilsBase(schemes) { private val dynamicColor = MaterialDynamicColors() fun colorToolbarOverflowIcon(toolbar: MaterialToolbar) { diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt index b60b15a6..44f7eca3 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.Color import dynamiccolor.DynamicScheme import dynamiccolor.MaterialDynamicColors -fun DynamicScheme.toColorScheme(): ColorScheme { - return ColorScheme( +fun DynamicScheme.toColorScheme(): ColorScheme = + ColorScheme( primary = Color(MaterialDynamicColors().primary().getArgb(this)), onPrimary = Color(MaterialDynamicColors().onPrimary().getArgb(this)), primaryContainer = Color(MaterialDynamicColors().primaryContainer().getArgb(this)), @@ -45,4 +45,3 @@ fun DynamicScheme.toColorScheme(): ColorScheme { outlineVariant = Color(MaterialDynamicColors().outlineVariant().getArgb(this)), scrim = Color(MaterialDynamicColors().scrim().getArgb(this)) ) -}