Release Catima 2.37.0

Update feature graphic

.design/README.txt

@@ -0,0 +1,4 @@
+VectorDrawable does not support all SVG features, such as shadows and masks.
+Therefore the ic_launcher files are slightly different from the master files: no shadows, minor color tweaks, path optimisation.
+Use ic_launcher_*.svg files to generate assets for the app icon
+Use master_*.svg files to generate other assets (e.g. feature graphic, playstore icon) or to rework the icon design

.design/ic_launcher_background.svg

@@ -0,0 +1,3 @@
+<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="108" height="108" fill="#1F4262"/>
+</svg>

.design/ic_launcher_foreground.svg

@@ -0,0 +1,18 @@
+<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M45.5 30.5768L68.0526 22.3683C70.1285 21.6127 72.4239 22.6831 73.1795 24.759L75.9156 32.2765L49.6042 41.8531L45.5 30.5768Z" fill="#F5A3A3"/>
+<path d="M70.3604 25.785C70.1715 25.2661 69.5977 24.9985 69.0787 25.1874L49.3451 32.3698L51.3973 38.008L72.0705 30.4835L70.3604 25.785ZM75.9156 32.2765L49.6042 41.8531L45.5 30.5768L68.0526 22.3683C70.1285 21.6127 72.4239 22.6831 73.1795 24.759L75.9156 32.2765Z" fill="#CF1717"/>
+<path d="M58.4155 30.5767L35.8629 22.3682C33.787 21.6126 31.4916 22.683 30.7361 24.7589L27.9999 32.2764L54.3113 41.853L58.4155 30.5767Z" fill="#F5A3A3"/>
+<path d="M33.5551 25.7849C33.744 25.2659 34.3179 24.9984 34.8368 25.1873L54.5704 32.3697L52.5183 38.0078L31.845 30.4834L33.5551 25.7849ZM27.9999 32.2764L54.3113 41.853L58.4155 30.5767L35.8629 22.3682C33.787 21.6126 31.4916 22.683 30.7361 24.7589L27.9999 32.2764Z" fill="#DD1818"/>
+<path d="M28.6958 37.5992C29.0794 35.4236 31.1543 33.9709 33.3298 34.3545L80.6006 42.6897C82.7761 43.0734 84.2288 45.148 83.8452 47.3235L81.8157 58.8328C82.2998 59.0988 84.6663 60.1572 87.416 57.2288V57.229C87.9156 56.6942 88.4507 56.2283 89.0068 55.8575C91.764 54.0193 93.9993 55.2156 93.9993 58.5293C93.9992 61.343 92.3876 64.7782 90.2134 66.8763C86.626 70.5423 80.6933 70.5552 79.7524 70.5332L77.5938 82.7766C77.2101 84.9522 75.1355 86.4049 72.96 86.0213L25.6892 77.6861C25.6723 77.6831 25.6555 77.6797 25.6387 77.6765C23.4483 77.3198 22.0001 76.7026 22 76.0003C22 75.7175 22.2348 75.4485 22.6582 75.2046C22.3986 74.5429 22.3121 73.8036 22.4446 73.0523L28.6958 37.5992Z" fill="#B81414"/>
+<path d="M90.6707 60.748C90.6707 61.8526 89.9257 63.2447 89.0066 63.8574C88.0876 64.4701 87.3425 64.0714 87.3425 62.9668C87.3425 61.8622 88.0876 60.4701 89.0066 59.8574C89.9257 59.2447 90.6707 59.6434 90.6707 60.748Z" fill="#E82E2E"/>
+<path d="M78 30C80.2091 30 82 31.7909 82 34V70C82 72.2091 80.2091 74 78 74H30C25.5817 74 22 74.8954 22 76V32C22 30.8954 25.5817 30 30 30H78Z" fill="#E82E2E"/>
+<path d="M51.2008 54.25C51.615 53.5325 52.5324 53.2867 53.2498 53.7009C53.9449 54.1022 54.1973 54.9757 53.8358 55.6822L53.762 55.8178C53.4005 56.5242 53.6529 57.3977 54.3479 57.799C55.043 58.2003 55.9256 57.9821 56.3567 57.3158L56.4372 57.1841C56.8683 56.5178 57.751 56.2997 58.446 56.7009C59.1634 57.1151 59.4092 58.0325 58.995 58.75C57.7524 60.9023 55.0002 61.6397 52.8479 60.3971C50.6956 59.1544 49.9582 56.4023 51.2008 54.25Z" fill="#8A0F0F"/>
+<path d="M52.795 54.25C52.3808 53.5325 51.4634 53.2867 50.746 53.7009C50.051 54.1022 49.7986 54.9757 50.1601 55.6822L50.2339 55.8178C50.5954 56.5242 50.343 57.3977 49.6479 57.799C48.9529 58.2003 48.0702 57.9821 47.6392 57.3158L47.5586 57.1841C47.1276 56.5178 46.2449 56.2997 45.5499 56.7009C44.8324 57.1151 44.5866 58.0325 45.0008 58.75C46.2435 60.9023 48.9956 61.6397 51.1479 60.3971C53.3002 59.1544 54.0377 56.4023 52.795 54.25Z" fill="#8A0F0F"/>
+<path d="M53.2989 56.75C52.7216 57.75 51.2782 57.75 50.7009 56.75L48.1028 52.25C47.5254 51.25 48.2471 50 49.4018 50L54.598 50C55.7527 50 56.4744 51.25 55.897 52.25L53.2989 56.75Z" fill="#8A0F0F"/>
+<path d="M40.4999 40.5C43.7321 40.5 46.4561 42.6167 47.4233 45.5269C47.6845 46.313 47.2592 47.162 46.4731 47.4233C45.687 47.6846 44.8379 47.2592 44.5766 46.4731C43.9982 44.7328 42.3813 43.5 40.4999 43.5C38.6186 43.5 37.0016 44.7328 36.4233 46.4731C36.162 47.2592 35.3129 47.6846 34.5268 47.4233C33.7407 47.162 33.3153 46.313 33.5766 45.5269C34.5438 42.6167 37.2678 40.5 40.4999 40.5Z" fill="#8A0F0F"/>
+<path d="M63.4999 40.5C66.7321 40.5 69.4561 42.6167 70.4233 45.5269C70.6845 46.313 70.2592 47.162 69.4731 47.4233C68.687 47.6846 67.8379 47.2592 67.5766 46.4731C66.9982 44.7328 65.3813 43.5 63.4999 43.5C61.6186 43.5 60.0016 44.7328 59.4233 46.4731C59.162 47.2592 58.3129 47.6846 57.5268 47.4233C56.7407 47.162 56.3153 46.313 56.5766 45.5269C57.5438 42.6167 60.2678 40.5 63.4999 40.5Z" fill="#8A0F0F"/>
+<path d="M26 55C25.4477 55 25 54.5523 25 54C25 53.4477 25.4477 53 26 53H42C42.5523 53 43 53.4477 43 54C43 54.5523 42.5523 55 42 55H26Z" fill="#8A0F0F"/>
+<path d="M26.3511 60.9363C25.834 61.1302 25.2576 60.8682 25.0637 60.3511C24.8698 59.834 25.1318 59.2575 25.6489 59.0636L41.6488 53.0637C42.1659 52.8698 42.7423 53.1318 42.9362 53.6489C43.1302 54.166 42.8681 54.7424 42.351 54.9363L26.3511 60.9363Z" fill="#8A0F0F"/>
+<path d="M61.649 54.9364C61.1319 54.7425 60.8699 54.1661 61.0638 53.6489C61.2577 53.1318 61.8341 52.8698 62.3512 53.0637L78.3511 59.0637C78.8682 59.2576 79.1302 59.834 78.9363 60.3511C78.7424 60.8683 78.166 61.1303 77.6489 60.9364L61.649 54.9364Z" fill="#8A0F0F"/>
+<path d="M78 55C78.5523 55 79 54.5523 79 54C79 53.4477 78.5523 53 78 53H62C61.4477 53 61 53.4477 61 54C61 54.5523 61.4477 55 62 55H78Z" fill="#8A0F0F"/>
+</svg>

.design/ic_launcher_monochrome.svg

@@ -0,0 +1,10 @@
+<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M75 31.0001C78.3137 31.0001 81 33.6864 81 37.0001V44.4339C81.8278 45.6739 82.1977 47.2224 81.9185 48.8065L81 54.0147V55.8692C81.2385 55.7207 81.5023 55.5135 81.7856 55.2232L81.864 55.1412C82.3815 54.5878 82.9573 54.0824 83.5825 53.6656L83.7239 53.5736C85.1958 52.6378 87.0298 52.1726 88.6753 53.0533C90.3738 53.9624 90.9907 55.8341 90.9907 57.6305L90.9895 57.7735C90.9384 60.7815 89.2885 64.1632 87.1213 66.2555L87.1211 66.2552C85.2162 68.1795 82.7376 69.0841 80.7588 69.5221C80.6417 69.548 80.5255 69.572 80.4106 69.5951C79.8487 70.7645 78.9192 71.7235 77.7715 72.3223L76.709 78.3509C76.1335 81.6141 73.0215 83.7931 69.7583 83.2179L30.3657 76.2718C30.328 76.2652 30.292 76.2576 30.2576 76.2508C29.124 76.0893 28.0601 75.8434 27.2224 75.4942C26.8046 75.32 26.3313 75.075 25.9299 74.7176C25.538 74.3686 25.0098 73.7183 25.0005 72.7752C25.0005 72.7766 25.0007 72.778 25.0007 72.7794C25.0006 72.7696 25 72.7599 25 72.7501V34.5001C25 33.8368 25.3232 33.2494 25.8203 32.8856C26.2266 32.4885 26.6978 32.2406 27.0352 32.0872C27.6048 31.8283 28.2727 31.6301 28.9683 31.4781C29.7466 31.308 30.6353 31.1794 31.5925 31.0987C31.5854 31.0993 31.5784 31.0998 31.5713 31.1004L32.6726 28.0748L32.7275 27.93C33.9136 24.9114 37.2979 23.3732 40.363 24.4888L52.8337 29.0277L65.3047 24.4888C68.4185 23.3555 71.8617 24.9609 72.9951 28.0748L74.0598 31.0001H75ZM34.8474 73.0001L70.4529 79.2784C71.5406 79.4701 72.5777 78.7437 72.7695 77.6561L73.5906 73.0001H34.8474ZM34 35.0001C32.3461 35.0001 30.8829 35.1543 29.8225 35.3861C29.4849 35.4599 29.2118 35.5362 29 35.6082V69.4718C30.4021 69.1686 32.1493 69.0001 34 69.0001H75L75.103 68.9974C76.1256 68.9455 76.9454 68.1256 76.9973 67.1031L77 67.0001V37.0001C77 35.8955 76.1046 35.0001 75 35.0001H34ZM86.782 56.5904C86.6812 56.5851 86.3996 56.6115 85.8818 56.9412L85.8013 56.9937C85.4702 57.2144 85.1253 57.5101 84.7834 57.8761C84.7824 57.8772 84.7811 57.8783 84.78 57.8795L84.6406 58.025C83.4435 59.2483 82.1848 59.8799 81 60.1214V65.3201C82.1999 64.9382 83.3456 64.358 84.219 63.5015L84.343 63.3775C85.8843 61.8895 86.9907 59.4316 86.9907 57.6305L86.9897 57.5343C86.9769 56.9198 86.8422 56.671 86.782 56.5904ZM46.5574 31.0001L38.9949 28.2476C37.9893 27.8817 36.8807 28.3724 36.469 29.347L36.4314 29.4429L35.8645 31.0001H46.5574ZM69.803 31.0001L69.2363 29.4429C68.8586 28.4051 67.7109 27.8698 66.6729 28.2476L59.1104 31.0001H69.803Z" fill="black"/>
+<path d="M55.165 51C56.3197 51.0001 57.0412 52.25 56.4639 53.25L54.6943 56.3145C54.5983 56.7617 54.7947 57.2387 55.2122 57.4797C55.7303 57.7788 56.3927 57.6015 56.6919 57.0835C57.1061 56.3661 58.0235 56.1202 58.741 56.5344C59.4584 56.9487 59.7042 57.8661 59.29 58.5835C58.1625 60.5364 55.6651 61.2054 53.7122 60.0779C53.4495 59.9262 53.2103 59.7495 52.9954 59.553C52.7804 59.7495 52.5414 59.9263 52.2788 60.0779C50.3258 61.2055 47.8283 60.5365 46.7007 58.5835C46.2865 57.8661 46.5324 56.9487 47.2498 56.5344C47.9672 56.1202 48.8846 56.3661 49.2988 57.0835C49.598 57.6016 50.2607 57.7789 50.7788 57.4797C51.2042 57.2341 51.3997 56.7436 51.2905 56.2891L49.5359 53.25C48.9586 52.25 49.6801 51.0001 50.8347 51H55.165Z" fill="black"/>
+<path d="M43.2499 42.5C46.0011 42.5 48.4844 44.0694 49.4008 46.4639C49.6968 47.2376 49.3097 48.1048 48.536 48.4009C47.7623 48.697 46.8951 48.3098 46.599 47.5361C46.1806 46.4427 44.9148 45.5 43.2499 45.5C41.5849 45.5 40.3192 46.4427 39.9008 47.5361C39.6047 48.3098 38.7374 48.697 37.9637 48.4009C37.1901 48.1048 36.8029 47.2376 37.099 46.4639C38.0153 44.0694 40.4987 42.5 43.2499 42.5Z" fill="black"/>
+<path d="M62.7499 42.5C65.5011 42.5 67.9844 44.0694 68.9008 46.4639C69.1968 47.2376 68.8097 48.1048 68.036 48.4009C67.2623 48.697 66.3951 48.3098 66.099 47.5361C65.6806 46.4427 64.4148 45.5 62.7499 45.5C61.0849 45.5 59.8192 46.4427 59.4008 47.5361C59.1047 48.3098 58.2374 48.697 57.4637 48.4009C56.6901 48.1048 56.3029 47.2376 56.599 46.4639C57.5153 44.0694 59.9987 42.5 62.7499 42.5Z" fill="black"/>
+<path d="M33 55C32.1716 55 31.5 54.3284 31.5 53.5C31.5 52.6716 32.1716 52 33 52H44.25C45.0784 52 45.75 52.6716 45.75 53.5C45.75 54.3284 45.0784 55 44.25 55H33Z" fill="black"/>
+<path d="M33.6106 59.8701C32.8538 60.2073 31.9671 59.8671 31.6299 59.1104C31.2928 58.3537 31.6329 57.467 32.3896 57.1298L43.6118 52.1298C44.3685 51.7926 45.2553 52.1328 45.5924 52.8895C45.9296 53.6462 45.5894 54.533 44.8327 54.8701L33.6106 59.8701Z" fill="black"/>
+<path d="M60.8488 54.8768C60.0885 54.5478 59.7389 53.6647 60.0678 52.9044C60.3968 52.1441 61.2798 51.7945 62.0401 52.1234L73.5957 57.1233C74.356 57.4523 74.7056 58.3353 74.3767 59.0956C74.0477 59.8559 73.1647 60.2056 72.4043 59.8766L60.8488 54.8768Z" fill="black"/>
+<path d="M73 52C73.8284 52 74.5 52.6716 74.5 53.5C74.5 54.3284 73.8284 55 73 55H61.5C60.6716 55 60 54.3284 60 53.5C60 52.6716 60.6716 52 61.5 52H73Z" fill="black"/>
+</svg>

.design/master_color.svg

@@ -0,0 +1,69 @@
+<svg width="432" height="432" viewBox="0 0 432 432" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="432" height="432" fill="#1F4262"/>
+<g filter="url(#filter0_d_39_7)">
+<path d="M182 122.308L272.21 89.4737C280.514 86.4514 289.696 90.7328 292.718 99.0364L303.663 129.107L198.417 167.413L182 122.308Z" fill="#F5A3A3"/>
+<path d="M274.263 95.1118C279.452 93.2229 285.191 95.8988 287.08 101.089L295.972 125.521L202.003 159.723L189.69 125.894L274.263 95.1118Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter1_d_39_7)">
+<path d="M233.662 122.307L143.452 89.4727C135.148 86.4504 125.966 90.7318 122.944 99.0355L112 129.106L217.245 167.412L233.662 122.307Z" fill="#F5A3A3"/>
+<path d="M141.399 95.1109C136.21 93.2219 130.471 95.8978 128.582 101.088L119.69 125.52L213.659 159.722L225.972 125.893L141.399 95.1109Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter2_d_39_7)">
+<path d="M114.783 150.397C116.318 141.695 124.617 135.884 133.319 137.419L322.402 170.759C331.104 172.293 336.915 180.592 335.381 189.294L327.263 235.331C329.199 236.395 338.665 240.629 349.664 228.915V228.916C351.663 226.777 353.803 224.913 356.027 223.43C367.056 216.077 375.997 220.862 375.997 234.117C375.997 245.372 369.551 259.113 360.854 267.505C346.504 282.169 322.773 282.222 319.01 282.134L310.375 331.106C308.841 339.809 300.542 345.619 291.84 344.085L102.757 310.745C102.684 310.732 102.611 310.717 102.538 310.703C93.7855 309.276 88 306.809 88 304.001C88 302.87 88.9396 301.794 90.6338 300.818C89.5953 298.172 89.2485 295.215 89.7783 292.21L114.783 150.397Z" fill="#B81414"/>
+</g>
+<circle cx="8" cy="8" r="8" transform="matrix(0.83205 -0.5547 0 1 349.37 243.867)" fill="#E82E2E"/>
+<g filter="url(#filter3_d_39_7)">
+<path d="M312 120C320.837 120 328 127.163 328 136V280C328 288.837 320.837 296 312 296H120C102.327 296 88 299.582 88 304V128C88 123.582 102.327 120 120 120H312Z" fill="#E82E2E"/>
+</g>
+<path d="M230.785 232C227.471 237.74 220.132 239.706 214.392 236.392C208.653 233.079 206.686 225.74 210 220" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M185.2 232C188.513 237.74 195.853 239.706 201.592 236.392C207.332 233.079 209.298 225.74 205.984 220" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M213.196 227C210.887 231 205.113 231 202.804 227L192.412 209C190.102 205 192.989 200 197.608 200L218.392 200C223.011 200 225.898 205 223.588 209L213.196 227Z" fill="#8A0F0F"/>
+<path d="M184 184C180.909 174.699 172.227 168 162 168C151.773 168 143.091 174.699 140 184" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M276 184C272.909 174.699 264.227 168 254 168C243.773 168 235.091 174.699 232 184" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M168 216H104" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M168 216L104 240" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M312 240L248 216" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M248 216H312" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<defs>
+<filter id="filter0_d_39_7" x="166" y="72.5049" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+<filter id="filter1_d_39_7" x="95.9995" y="72.5039" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+<filter id="filter2_d_39_7" x="72" y="121.173" width="319.997" height="239.158" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+<filter id="filter3_d_39_7" x="72" y="104" width="272" height="216" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_39_7"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_39_7" result="shape"/>
+</filter>
+</defs>
+</svg>

.github/workflows/android.yml

@@ -24,7 +24,7 @@ permissions:
   security-events: none
   statuses: none
 env:
-  JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
+  JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -32,14 +32,14 @@ jobs:
       matrix:
         flavor: [Foss, Gplay]
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
       - name: Fail on bad translations
         run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
       - uses: gradle/actions/wrapper-validation@v4
-      - name: set up OpenJDK 17
+      - name: set up OpenJDK 21
         run: |
           sudo apt-get update
-          sudo apt-get install -y openjdk-17-jdk-headless
+          sudo apt-get install -y openjdk-21-jdk-headless
           sudo update-alternatives --auto java
       - name: Build
         run: ./gradlew assemble${{ matrix.flavor }}Release
@@ -64,8 +64,6 @@ jobs:
           api-level: 35
           arch: x86_64
           script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
-      - name: SpotBugs
-        run: ./gradlew spotbugs${{ matrix.flavor }}Release
       - name: Archive test results
         if: always()
         uses: actions/upload-artifact@v4.6.2

.github/workflows/changelog-to-fastlane.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
     - name: Setup Python
       uses: actions/setup-python@v5.6.0
       with:

.github/workflows/contributors-to-file.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
     - name: Update contributors
       id: update_contributors
       uses: TheLastProject/contributors-to-file-action@v3.2.0

.github/workflows/generate-feature-graphic.yml

@@ -25,7 +25,7 @@ jobs:
   generate-feature-graphic:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v5.0.0
     - name: Install requirements
       run: |
         sudo apt-get update

.github/workflows/gradle-update.yml

@@ -1,33 +0,0 @@
-name: Gradle update
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '3 6 * * *'
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
-jobs:
-  gradle-update:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.2.2
-    - uses: obfusk/gradle-update-action@v3.0.0
-      id: gradle-update
-    - uses: gradle/actions/wrapper-validation@v4
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
-      with:
-        title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
-        commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
-        branch-suffix: timestamp

.github/workflows/update-locales.yml

@@ -25,7 +25,7 @@ jobs:
   update-locales:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v5.0.0
     - name: Add new locales
       run: .scripts/new-locales.py
     - name: Update locales

.scripts/generate_feature_graphic/featureGraphic.svg

@@ -1,15 +1,76 @@
 <svg width="1024" height="500" viewBox="0 0 1024 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="1024" height="500" fill="#223355"/>
-<text direction="ltr" fill="white" xml:space="preserve" style="" font-family="Yesteryear" font-size="150" letter-spacing="0em"><tspan x="470.082" y="285.511">Catima
-</tspan></text>
-<path d="M381.046 147.001L236.3 211.446L276.524 301.79L421.27 237.345L381.046 147.001Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M402.077 219.13L240.07 147L191.984 255.004L353.99 327.135L402.077 219.13Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M437.17 236.241L251.831 183.096L220.071 293.855L405.41 347L437.17 236.241Z" fill="#C80000" stroke="#C80000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M412.879 178.633H220.071V293.855H412.879V178.633Z" fill="#FF0000" stroke="#FF0000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M221.482 296.217C238.316 296.217 251.963 269.366 251.963 236.244C251.963 203.121 238.316 176.27 221.482 176.27C204.647 176.27 191 203.121 191 236.244C191 269.366 204.647 296.217 221.482 296.217Z" fill="#FF0000" stroke="#FF0000" stroke-width="3.44232" stroke-linejoin="round"/>
-<path d="M307.256 250.444C307.256 253.187 306.289 255.842 304.526 257.944C302.763 260.045 300.316 261.458 297.614 261.934C294.913 262.41 292.13 261.92 289.755 260.548C287.379 259.177 285.563 257.012 284.625 254.435" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M330.301 254.298C329.363 256.875 327.547 259.04 325.171 260.411C322.796 261.783 320.013 262.273 317.312 261.797C314.61 261.321 312.163 259.908 310.4 257.807C308.637 255.706 307.671 253.05 307.671 250.307" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M248.345 225.937L266.818 207.465L285.29 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<path d="M329.625 225.937L348.098 207.465L366.571 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<text direction="ltr" fill="white" xml:space="preserve" style="" font-family="Lexend Deca" font-size="35" font-weight="200" letter-spacing="0em"><tspan x="466" y="340">Loyalty Card Wallet</tspan></text>
+<g clip-path="url(#clip0_78_203)">
+<path d="M1024 0H0V500H1024V0Z" fill="#1F4262"/>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lexend" font-size="35" letter-spacing="0em"><tspan x="481" y="325">Loyalty Card Wallet</tspan></text>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lobster" font-size="150" letter-spacing="0em"><tspan x="469" y="270">Catima</tspan></text>
+<g filter="url(#filter0_d_78_203)">
+<path d="M218 156.307L308.21 123.473C316.514 120.45 325.696 124.732 328.718 133.035L339.663 163.106L234.417 201.412L218 156.307Z" fill="#F5A3A3"/>
+<path d="M310.263 129.111C315.452 127.222 321.191 129.898 323.08 135.088L331.972 159.52L238.003 193.722L225.69 159.893L310.263 129.111Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter1_d_78_203)">
+<path d="M269.662 156.307L179.452 123.473C171.148 120.45 161.966 124.732 158.944 133.035L148 163.106L253.245 201.412L269.662 156.307Z" fill="#F5A3A3"/>
+<path d="M177.399 129.111C172.21 127.222 166.471 129.898 164.582 135.088L155.69 159.52L249.659 193.722L261.972 159.893L177.399 129.111Z" stroke="#E82E2E" stroke-width="12"/>
+</g>
+<g filter="url(#filter2_d_78_203)">
+<path d="M150.783 184.396C152.318 175.694 160.617 169.884 169.319 171.418L358.402 204.759C367.104 206.293 372.915 214.592 371.381 223.294L363.263 269.331C365.199 270.395 374.665 274.629 385.664 262.915V262.916C387.662 260.777 389.802 258.913 392.027 257.43C403.056 250.077 411.997 254.862 411.997 268.117C411.997 279.372 405.55 293.113 396.853 301.505C382.504 316.169 358.773 316.221 355.01 316.133L346.375 365.106C344.84 373.809 336.542 379.619 327.84 378.085L138.757 344.744C138.689 344.732 138.622 344.719 138.555 344.706C129.793 343.279 124 340.81 124 338.001C124 336.87 124.939 335.794 126.633 334.818C125.594 332.171 125.248 329.214 125.778 326.209L150.783 184.396Z" fill="#B81414"/>
+</g>
+<circle cx="8" cy="8" r="8" transform="matrix(0.83205 -0.5547 0 1 385.37 277.867)" fill="#E82E2E"/>
+<g filter="url(#filter3_d_78_203)">
+<path d="M348 154C356.837 154 364 161.163 364 170V314C364 322.837 356.837 330 348 330H156C138.327 330 124 333.582 124 338V162C124 157.582 138.327 154 156 154H348Z" fill="#E82E2E"/>
+</g>
+<path d="M266.784 266C263.471 271.74 256.132 273.706 250.392 270.392C244.653 267.079 242.686 259.74 246 254" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M221.2 266C224.514 271.74 231.853 273.706 237.592 270.392C243.332 267.079 245.298 259.74 241.984 254" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M249.196 261C246.887 265 241.113 265 238.804 261L228.412 243C226.102 239 228.989 234 233.608 234L254.392 234C259.011 234 261.898 239 259.588 243L249.196 261Z" fill="#8A0F0F"/>
+<path d="M220 218C216.909 208.699 208.227 202 198 202C187.773 202 179.091 208.699 176 218" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M312 218C308.909 208.699 300.227 202 290 202C279.773 202 271.091 208.699 268 218" stroke="#8A0F0F" stroke-width="12" stroke-linecap="round"/>
+<path d="M204 250H140" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M204 250L140 274" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M348 274L284 250" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+<path d="M284 250H348" stroke="#8A0F0F" stroke-width="8" stroke-linecap="round"/>
+</g>
+<defs>
+<filter id="filter0_d_78_203" x="202" y="106.504" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<filter id="filter1_d_78_203" x="132" y="106.504" width="153.663" height="110.908" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<filter id="filter2_d_78_203" x="108" y="155.172" width="319.997" height="239.159" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<filter id="filter3_d_78_203" x="108" y="138" width="272" height="216" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="8"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_78_203"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_78_203" result="shape"/>
+</filter>
+<clipPath id="clip0_78_203">
+<rect width="1024" height="500" fill="white"/>
+</clipPath>
+</defs>
 </svg>

.scripts/generate_feature_graphic/fonts/Lexend/OFL.txt

@@ -2,7 +2,7 @@ Copyright 2018 The Lexend Project Authors (https://github.com/googlefonts/lexend
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://openfontlicense.org
 
 
 -----------------------------------------------------------

.scripts/generate_feature_graphic/fonts/Lobster/OFL.txt

@@ -1,9 +1,8 @@
-Copyright (c) 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI)
-(astigma@astigmatic.com), with Reserved Font Names "Yesteryear"
+Copyright 2010 The Lobster Project Authors (https://github.com/impallari/The-Lobster-Font), with Reserved Font Name "Lobster".
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://openfontlicense.org
 
 
 -----------------------------------------------------------

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -33,20 +33,21 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
     perl -pi -e 's/Catima/$ENV{appname}/' featureGraphic.svg
     perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
     # Set correct font or font size for language if needed
-    # (Lexend Deca has limited support and some characters are big)
-    # We specifically need the Serif version because of the 200 weight
+    # (Lobster and Lexend have limited language support)
     case "$(basename "$lang")" in
-      bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
-      fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Yesteryear/Noto Sans Arabic/" -e "s/Lexend Deca/Noto Sans Arabic/" featureGraphic.svg ;;
-      hi-IN) sed -i -e "s/Yesteryear/Noto Sans Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
-      ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
-      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e "s/Yesteryear/Noto Serif Kannada/" featureGraphic.svg ;;
-      ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
-      zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
-      zh-TW) sed -i -e "s/Yesteryear/Noto Sans CJK TC/" -e "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
+      bg|el-GR|ru-RU|uk) sed -i "s/Lexend/Noto Sans/" featureGraphic.svg ;;
+      ar|fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Lobster/Noto Sans Arabic/" -e "s/Lexend/Noto Sans Arabic/" featureGraphic.svg ;;
+      he-IL) sed -i -e "s/Lobster/Noto Sans Hebrew/" -e "s/Lexend/Noto Sans Hebrew/" featureGraphic.svg ;;
+      hi-IN) sed -i -e "s/Lobster/Noto Sans Devanagari/" -e "s/Lexend/Noto Sans Devanagari/" featureGraphic.svg ;;
+      ja-JP) sed -i "s/Lexend/Noto Sans CJK JP/" featureGraphic.svg ;;
+      kn-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' -e "s/Lobster/Noto Sans Kannada/" -e "s/Lexend/Noto Sans Kannada/" featureGraphic.svg ;;
+      ko) sed -i "s/Lexend/Noto Sans CJK KR/" featureGraphic.svg ;;
+      zh-CN) sed -i "s/Lexend/Noto Sans CJK SC/" featureGraphic.svg ;;
+      zh-TW) sed -i -e "s/Lobster/Noto Sans CJK TC/" -e "s/Lexend/Noto Sans CJK TC/" featureGraphic.svg ;;
       *) ;;
     esac
   fi
+
   # Ensure images directory exists
   mkdir -p images
   # Generate .png (we use Inkscape because ImageMagick ignores RTL)

.scripts/new-locales.py

@@ -11,6 +11,7 @@ MIN_PERCENT = 90
 NOT_LANGS = ("night", "w600dp")
 REPLACE_CODES = {
     "el": "el-rGR",
+    "he": "iw",
     "id": "in-rID",
     "ro": "ro-rRO",
     "zh_Hans": "zh-rCN",

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 
-## Unreleased - 148
+## v2.37.0 - 151 (2025-08-22)
+
+- New redesign of the Catima logo
+- Translation updates
+
+## v2.36.0 - 150 (2025-08-05)
+
+- Add a widget showing all non-archived cards
+- Prevent the keyboard from overlapping the save button in edit and group screens
+
+## v2.35.1 - 149 (2025-06-17)
+
+- Dependency and translation updates
+
+## v2.35.0 - 148 (2025-05-17)
 
 - Add ability to choose barcode width in fullscreen view
 - Remove confusing import from app function

CONTRIBUTING.md

@@ -36,10 +36,6 @@ These are the Android lint checker, run using:
 
     # ./gradlew lintRelease
 
-and SpotBugs, run using:
-
-    # ./gradlew spotbugsRelease
-
 The final check is by testing the application on a live device and verifying
 the basic functionality works as expected.
 

Gemfile

@@ -1,3 +1,8 @@
 source "https://rubygems.org"
 
 gem "fastlane"
+
+# https://github.com/fastlane/fastlane/issues/29183
+gem "abbrev"
+gem "mutex_m"
+gem "ostruct"

Gemfile.lock

@@ -5,29 +5,31 @@ GEM
       base64
       nkf
       rexml
+    abbrev (0.1.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.1072.0)
-    aws-sdk-core (3.220.2)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1117.0)
+    aws-sdk-core (3.226.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.99.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+      logger
+    aws-sdk-kms (1.105.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.182.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.189.1)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
+    base64 (0.3.0)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -56,10 +58,10 @@ GEM
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -69,7 +71,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.0)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -109,7 +111,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
@@ -156,22 +158,24 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.10.2)
+    json (2.12.2)
     jwt (2.10.1)
       base64
+    logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
-    naturally (2.2.1)
+    naturally (2.3.0)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
+    ostruct (0.6.1)
     plist (3.7.2)
-    public_suffix (6.0.1)
-    rake (13.2.1)
+    public_suffix (6.0.2)
+    rake (13.3.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -182,7 +186,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.19.0)
+    signet (0.20.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -209,7 +213,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
+    xcpretty (0.4.1)
       rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
@@ -218,7 +222,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  abbrev
   fastlane
+  mutex_m
+  ostruct
 
 BUNDLED WITH
    2.5.22

app/build.gradle.kts

@@ -1,17 +1,12 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import com.github.spotbugs.snom.SpotBugsTask
 
 plugins {
     id("com.android.application")
-    id("com.github.spotbugs")
     id("org.jetbrains.kotlin.android")
 }
 
-spotbugs {
-    ignoreFailures.set(false)
-    setEffort("max")
-    excludeFilter.set(file("./config/spotbugs/exclude.xml"))
-    reportsDir.set(layout.buildDirectory.file("reports/spotbugs/").get().asFile)
+kotlin {
+    jvmToolchain(21)
 }
 
 android {
@@ -22,13 +17,13 @@ android {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
         targetSdk = 35
-        versionCode = 147
-        versionName = "2.34.5"
+        versionCode = 151
+        versionName = "2.37.0"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -104,15 +99,20 @@ android {
         lintConfig = file("lint.xml")
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
 dependencies {
     // AndroidX
-    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
     implementation("androidx.constraintlayout:constraintlayout:2.2.1")
     implementation("androidx.core:core-ktx:1.16.0")
+    implementation("androidx.core:core-remoteviews:1.1.0")
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.exifinterface:exifinterface:1.4.1")
     implementation("androidx.palette:palette:1.0.0")
@@ -128,34 +128,19 @@ dependencies {
     implementation("com.jaredrummler:colorpicker:1.1.0")
     implementation("net.lingala.zip4j:zip4j:2.11.5")
 
-    // SpotBugs
-    implementation("io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0")
-
     // Testing
-    val androidXTestVersion = "1.6.1"
+    val androidXTestVersion = "1.7.0"
     val junitVersion = "4.13.2"
     testImplementation("androidx.test:core:$androidXTestVersion")
     testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:4.14.1")
+    testImplementation("org.robolectric:robolectric:4.15.1")
 
     androidTestImplementation("androidx.test:core:$androidXTestVersion")
     androidTestImplementation("junit:junit:$junitVersion")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.ext:junit:1.3.0")
     androidTestImplementation("androidx.test:runner:$androidXTestVersion")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-}
-
-tasks.withType<SpotBugsTask>().configureEach {
-    description = "Run spotbugs"
-    group = "verification"
-
-    //classes = fileTree("build/intermediates/javac/debug/compileDebugJavaWithJavac/classes")
-    //source = fileTree("src/main/java")
-    //classpath = files()
-
-    reports.maybeCreate("xml").required.set(false)
-    reports.maybeCreate("html").required.set(true)
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
 }
 
 tasks.register("copyRawResFiles", Copy::class) {

app/src/debug/res/values-he-rIL/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">קטימה ניפוי באגים</string>
+</resources>

app/src/debug/res/values-ta/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">கேட்டிமா Debug</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -30,6 +30,20 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:localeConfig="@xml/locales_config">
+        
+        <receiver
+            android:name=".ListWidget"
+            android:label="@string/card_list_widget_name"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/list_widget_info" />
+         </receiver>
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -75,7 +89,8 @@
         <activity
             android:name=".ManageGroupActivity"
             android:label="@string/group_edit"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize"/>
         <activity
             android:name=".LoyaltyCardViewActivity"
             android:exported="true"

app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java

@@ -1,126 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import androidx.appcompat.widget.Toolbar;
-
-import com.google.zxing.BarcodeFormat;
-
-import java.util.ArrayList;
-
-import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
-
-/**
- * This activity is callable and will allow a user to enter
- * barcode data and generate all barcodes possible for
- * the data. The user may then select any barcode, where its
- * data and type will be returned to the caller.
- */
-public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements BarcodeSelectorAdapter.BarcodeSelectorListener {
-    private BarcodeSelectorActivityBinding binding;
-    private static final String TAG = "Catima";
-
-    // Result this activity will return
-    public static final String BARCODE_CONTENTS = "contents";
-    public static final String BARCODE_FORMAT = "format";
-
-    private final Handler typingDelayHandler = new Handler(Looper.getMainLooper());
-    public static final Integer INPUT_DELAY = 250;
-
-    private BarcodeSelectorAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = BarcodeSelectorActivityBinding.inflate(getLayoutInflater());
-        setTitle(R.string.selectBarcodeTitle);
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
-        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
-
-        EditText cardId = binding.cardId;
-        ListView mBarcodeList = binding.barcodes;
-        mAdapter = new BarcodeSelectorAdapter(this, new ArrayList<>(), this);
-        mBarcodeList.setAdapter(mAdapter);
-
-        cardId.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                // Delay the input processing so we avoid overload
-                typingDelayHandler.removeCallbacksAndMessages(null);
-
-                typingDelayHandler.postDelayed(() -> {
-                    Log.d(TAG, "Entered text: " + s);
-
-                    runOnUiThread(() -> {
-                        generateBarcodes(s.toString());
-                    });
-                }, INPUT_DELAY);
-            }
-        });
-
-        final Bundle b = getIntent().getExtras();
-        final String initialCardId = b != null ? b.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID) : null;
-
-        if (initialCardId != null) {
-            cardId.setText(initialCardId);
-        } else {
-            generateBarcodes("");
-        }
-    }
-
-    private void generateBarcodes(String value) {
-        // Update barcodes
-        ArrayList<CatimaBarcodeWithValue> barcodes = new ArrayList<>();
-        for (BarcodeFormat barcodeFormat : CatimaBarcode.barcodeFormats) {
-            CatimaBarcode catimaBarcode = CatimaBarcode.fromBarcode(barcodeFormat);
-            barcodes.add(new CatimaBarcodeWithValue(catimaBarcode, value));
-        }
-        mAdapter.setBarcodes(barcodes);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            setResult(Activity.RESULT_CANCELED);
-            finish();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onRowClicked(int inputPosition, View view) {
-        CatimaBarcodeWithValue barcodeWithValue = mAdapter.getItem(inputPosition);
-        CatimaBarcode catimaBarcode = barcodeWithValue.catimaBarcode();
-
-        if (!mAdapter.isValid(view)) {
-            Toast.makeText(this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        String barcodeFormat = catimaBarcode.format().name();
-        String value = barcodeWithValue.value();
-
-        Log.d(TAG, "Selected barcode type " + barcodeFormat);
-
-        Intent result = new Intent();
-        result.putExtra(BARCODE_FORMAT, barcodeFormat);
-        result.putExtra(BARCODE_CONTENTS, value);
-        BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-        finish();
-    }
-}

app/src/main/java/protect/card_locker/BarcodeSelectorActivity.kt

@@ -0,0 +1,118 @@
+package protect.card_locker
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.widget.Toast
+import androidx.core.view.MenuProvider
+import androidx.core.widget.doOnTextChanged
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import protect.card_locker.BarcodeSelectorAdapter.BarcodeSelectorListener
+import protect.card_locker.databinding.BarcodeSelectorActivityBinding
+
+/**
+ * This activity is callable and will allow a user to enter
+ * barcode data and generate all barcodes possible for
+ * the data. The user may then select any barcode, where its
+ * data and type will be returned to the caller.
+ */
+class BarcodeSelectorActivity : CatimaAppCompatActivity(), BarcodeSelectorListener, MenuProvider {
+    
+    private lateinit var binding: BarcodeSelectorActivityBinding
+    private lateinit var mAdapter: BarcodeSelectorAdapter
+    
+    companion object {
+        private const val TAG = "Catima"
+        
+        // Result this activity will return
+        const val BARCODE_CONTENTS = "contents"
+        const val BARCODE_FORMAT = "format"
+        
+        const val INPUT_DELAY = 250L
+    }
+    
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        addMenuProvider(this)
+        binding = BarcodeSelectorActivityBinding.inflate(layoutInflater)
+        setTitle(R.string.selectBarcodeTitle)
+        setContentView(binding.getRoot())
+        Utils.applyWindowInsets(binding.getRoot())
+        setSupportActionBar(binding.toolbar)
+        enableToolbarBackButton()
+        
+        var typingDelayJob: Job? = null
+        val cardId = binding.cardId
+        val mBarcodeList = binding.barcodes
+        mAdapter = BarcodeSelectorAdapter(this, ArrayList<CatimaBarcodeWithValue?>(), this)
+        mBarcodeList.adapter = mAdapter
+        
+        cardId.doOnTextChanged { s, _, _, _ ->
+            typingDelayJob?.cancel()
+            typingDelayJob =
+                lifecycleScope.launch {
+                    delay(INPUT_DELAY) // Delay the input processing so we avoid overload
+                    Log.d(TAG, "Entered text: $s")
+                    generateBarcodes(s.toString())
+                }
+        }
+        
+        val initialCardId = intent.extras?.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID)
+        
+        initialCardId?.let {
+            cardId.setText(initialCardId)
+        } ?: generateBarcodes("")
+        
+    }
+    
+    private fun generateBarcodes(value: String?) {
+        // Update barcodes
+        val barcodes = ArrayList<CatimaBarcodeWithValue?>()
+        CatimaBarcode.barcodeFormats.forEach {
+            val catimaBarcode = CatimaBarcode.fromBarcode(it)
+            barcodes.add(CatimaBarcodeWithValue(catimaBarcode, value))
+        }
+        mAdapter.setBarcodes(barcodes)
+    }
+    
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {}
+    
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        if (menuItem.itemId == android.R.id.home) {
+            setResult(RESULT_CANCELED)
+            finish()
+        }
+        
+        return true
+    }
+    
+    override fun onRowClicked(inputPosition: Int, view: View) {
+        val barcodeWithValue = mAdapter.getItem(inputPosition)
+        val catimaBarcode = barcodeWithValue!!.catimaBarcode()
+        
+        if (!mAdapter.isValid(view)) {
+            Toast.makeText(this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show()
+            return
+        }
+        
+        val barcodeFormat = catimaBarcode.format().name
+        val value = barcodeWithValue.value()
+        
+        Log.d(TAG, "Selected barcode type $barcodeFormat")
+        
+        Intent().apply {
+            putExtra(BARCODE_FORMAT, barcodeFormat)
+            putExtra(BARCODE_CONTENTS, value)
+            setResult(RESULT_OK, this)
+        }
+        finish()
+    }
+    
+}

app/src/main/java/protect/card_locker/CardShortcutConfigure.java

@@ -1,111 +0,0 @@
-package protect.card_locker;
-
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.recyclerview.widget.GridLayoutManager;
-
-import protect.card_locker.databinding.CardShortcutConfigureActivityBinding;
-import protect.card_locker.preferences.Settings;
-
-/**
- * The configuration screen for creating a shortcut.
- */
-public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
-    private CardShortcutConfigureActivityBinding binding;
-    static final String TAG = "Catima";
-    private SQLiteDatabase mDatabase;
-    private LoyaltyCardCursorAdapter mAdapter;
-
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        binding = CardShortcutConfigureActivityBinding.inflate(getLayoutInflater());
-        mDatabase = new DBHelper(this).getReadableDatabase();
-
-        // Set the result to CANCELED.  This will cause nothing to happen if the
-        // aback button is pressed.
-        setResult(RESULT_CANCELED);
-
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
-        toolbar.setTitle(R.string.shortcutSelectCard);
-        setSupportActionBar(toolbar);
-
-        // If there are no cards, bail
-        int cardCount = DBHelper.getLoyaltyCardCount(mDatabase);
-        if (cardCount == 0) {
-            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
-            finish();
-        }
-
-        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this, null);
-        binding.list.setAdapter(mAdapter);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        var layoutManager = (GridLayoutManager) binding.list.getLayoutManager();
-        if (layoutManager != null) {
-            var settings = new Settings(this);
-            layoutManager.setSpanCount(settings.getPreferredColumnCount());
-        }
-    }
-
-    private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
-        selected.moveToPosition(position);
-        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(CardShortcutConfigure.this, selected);
-
-        Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
-
-        ShortcutInfoCompat shortcut = ShortcutHelper.createShortcutBuilder(CardShortcutConfigure.this, loyaltyCard).build();
-
-        setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(CardShortcutConfigure.this, shortcut));
-
-        finish();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
-
-        return super.onCreateOptionsMenu(inputMenu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem) {
-        int id = inputItem.getItemId();
-
-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
-            invalidateOptionsMenu();
-
-            return true;
-        }
-
-        return super.onOptionsItemSelected(inputItem);
-    }
-
-    @Override
-    public void onRowClicked(int inputPosition) {
-        onClickAction(inputPosition);
-    }
-
-    @Override
-    public void onRowLongClicked(int inputPosition) {
-        // do nothing
-    }
-}

app/src/main/java/protect/card_locker/CardShortcutConfigure.kt

@@ -0,0 +1,96 @@
+package protect.card_locker
+
+import android.database.sqlite.SQLiteDatabase
+import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.widget.Toast
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.view.MenuProvider
+import androidx.recyclerview.widget.GridLayoutManager
+import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
+import protect.card_locker.databinding.CardShortcutConfigureActivityBinding
+import protect.card_locker.preferences.Settings
+
+class CardShortcutConfigure : CatimaAppCompatActivity(), CardAdapterListener, MenuProvider {
+    
+    private lateinit var binding: CardShortcutConfigureActivityBinding
+    private lateinit var mDatabase: SQLiteDatabase
+    private lateinit var mAdapter: LoyaltyCardCursorAdapter
+    
+    private companion object {
+        private const val TAG: String = "Catima"
+    }
+    
+    public override fun onCreate(savedInstanceBundle: Bundle?) {
+        super.onCreate(savedInstanceBundle)
+        addMenuProvider(this)
+        binding = CardShortcutConfigureActivityBinding.inflate(layoutInflater)
+        mDatabase = DBHelper(this).readableDatabase
+        
+        // Set the result to CANCELED.
+        // This will cause nothing to happen if the back button is pressed.
+        setResult(RESULT_CANCELED)
+        
+        setContentView(binding.getRoot())
+        Utils.applyWindowInsets(binding.getRoot())
+        
+        binding.toolbar.apply {
+            setTitle(R.string.shortcutSelectCard)
+            setSupportActionBar(this)
+        }
+        
+        // If there are no cards, bail
+        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
+            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show()
+            finish()
+        }
+        
+        val cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All)
+        mAdapter = LoyaltyCardCursorAdapter(this, cardCursor, this, null)
+        binding.list.setAdapter(mAdapter)
+    }
+    
+    override fun onResume() {
+        super.onResume()
+        
+        val layoutManager = binding.list.layoutManager as GridLayoutManager?
+        layoutManager?.setSpanCount(Settings(this).getPreferredColumnCount())
+    }
+    
+    private fun onClickAction(position: Int) {
+        val selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All)
+        selected.moveToPosition(position)
+        val loyaltyCard = LoyaltyCard.fromCursor(this, selected)
+        
+        Log.d(TAG, "Creating shortcut for card ${loyaltyCard.store}, ${loyaltyCard.id}")
+        
+        val shortcut = ShortcutHelper.createShortcutBuilder(this, loyaltyCard).build()
+        
+        setResult(RESULT_OK,
+                  ShortcutManagerCompat.createShortcutResultIntent(this, shortcut))
+        
+        finish()
+    }
+    
+    override fun onCreateMenu(inputMenu: Menu, menuInflater: MenuInflater) {
+        menuInflater.inflate(R.menu.card_details_menu, inputMenu)
+    }
+    
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        if (menuItem.itemId == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog()
+        }
+        return true
+    }
+    
+    override fun onRowClicked(inputPosition: Int) {
+        onClickAction(inputPosition)
+    }
+    
+    override fun onRowLongClicked(inputPosition: Int) {
+        // do nothing
+    }
+}

app/src/main/java/protect/card_locker/ListWidget.kt

@@ -0,0 +1,130 @@
+package protect.card_locker
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.Icon
+import android.os.Build
+import android.view.View
+import android.widget.RemoteViews
+import androidx.core.widget.RemoteViewsCompat
+import protect.card_locker.DBHelper.LoyaltyCardArchiveFilter
+
+class ListWidget : AppWidgetProvider() {
+    fun updateAll(context: Context) {
+        val appWidgetManager = AppWidgetManager.getInstance(context)
+        val componentName = ComponentName(context, ListWidget::class.java)
+        onUpdate(
+            context,
+            appWidgetManager,
+            appWidgetManager.getAppWidgetIds(componentName)
+        )
+    }
+
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray
+    ) {
+        for (appWidgetId in appWidgetIds) {
+            val database = DBHelper(context).readableDatabase
+
+            // Get cards
+            val order = Utils.getLoyaltyCardOrder(context);
+            val orderDirection = Utils.getLoyaltyCardOrderDirection(context);
+
+            val loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(
+                database,
+                "",
+                null,
+                order,
+                orderDirection,
+                LoyaltyCardArchiveFilter.Unarchived
+            )
+
+            // Bind every card to cell in the grid
+            var hasCards = false
+            val remoteCollectionItemsBuilder = RemoteViewsCompat.RemoteCollectionItems.Builder()
+            if (loyaltyCardCursor.moveToFirst()) {
+                do {
+                    val loyaltyCard = LoyaltyCard.fromCursor(context, loyaltyCardCursor)
+                    remoteCollectionItemsBuilder.addItem(
+                        loyaltyCard.id.toLong(),
+                        createRemoteViews(
+                            context, loyaltyCard
+                        )
+                    )
+                    hasCards = true
+                } while (loyaltyCardCursor.moveToNext())
+            }
+            loyaltyCardCursor.close()
+
+            // Create the base empty view
+            var views = RemoteViews(context.packageName, R.layout.list_widget_empty)
+
+            if (hasCards) {
+                // If we have cards, create the list
+                views = RemoteViews(context.packageName, R.layout.list_widget)
+                val templateIntent = Intent(context, LoyaltyCardViewActivity::class.java)
+                val pendingIntent = PendingIntent.getActivity(
+                    context,
+                    0,
+                    templateIntent,
+                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                )
+                views.setPendingIntentTemplate(R.id.grid_view, pendingIntent)
+
+                RemoteViewsCompat.setRemoteAdapter(
+                    context,
+                    views,
+                    appWidgetId,
+                    R.id.grid_view,
+                    remoteCollectionItemsBuilder.build()
+                )
+            }
+
+            // Let Android know the widget is ready for display
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+        }
+    }
+
+    private fun createRemoteViews(context: Context, loyaltyCard: LoyaltyCard): RemoteViews {
+        // Create a single cell for the grid view, bind it to open in the LoyaltyCardViewActivity
+        // Note: Android 5 will not use bitmaps
+        val remoteViews = RemoteViews(context.packageName, R.layout.list_widget_item).apply {
+            val headerColor = Utils.getHeaderColor(context, loyaltyCard)
+            val foreground = if (Utils.needsDarkForeground(headerColor)) Color.BLACK else Color.WHITE
+            setInt(R.id.item_container_foreground, "setBackgroundColor", headerColor)
+            val icon = loyaltyCard.getImageThumbnail(context)
+            // setImageViewIcon is not supported on Android 5, so force Android 5 down the text path
+            if (icon != null && Build.VERSION.SDK_INT >= 23) {
+                setInt(R.id.item_container_foreground, "setBackgroundColor", foreground)
+                setImageViewIcon(R.id.item_image, Icon.createWithBitmap(icon))
+                setViewVisibility(R.id.item_text, View.INVISIBLE)
+                setViewVisibility(R.id.item_image, View.VISIBLE)
+            } else {
+                setImageViewBitmap(R.id.item_image, null)
+                setTextViewText(R.id.item_text, loyaltyCard.store)
+                setViewVisibility(R.id.item_text, View.VISIBLE)
+                setViewVisibility(R.id.item_image, View.INVISIBLE)
+                setTextColor(
+                    R.id.item_text,
+                    foreground
+                )
+            }
+
+            // Add the card ID to the intent template
+            val fillInIntent = Intent().apply {
+                putExtra(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id)
+            }
+
+            setOnClickFillInIntent(R.id.item_container, fillInIntent)
+        }
+
+        return remoteViews
+    }
+}

app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java

@@ -44,6 +44,9 @@ import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -297,7 +300,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         super.onCreate(savedInstanceState);
         binding = LoyaltyCardEditActivityBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
+        Utils.applyWindowInsetsAndFabOffset(binding.getRoot(), binding.fabSave);
 
         viewModel = new ViewModelProvider(this).get(LoyaltyCardEditActivityViewModel.class);
 
@@ -576,7 +579,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
-            @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
             public void onTabSelected(TabLayout.Tab tab) {
                 viewModel.setTabIndex(tab.getPosition());
                 showPart(tab.getText().toString());
@@ -588,7 +590,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             }
 
             @Override
-            @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
             public void onTabReselected(TabLayout.Tab tab) {
                 viewModel.setTabIndex(tab.getPosition());
                 showPart(tab.getText().toString());

app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java

@@ -880,6 +880,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         } else if (id == R.id.action_star_unstar) {
             DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, loyaltyCard.starStatus == 0 ? 1 : 0);
 
+            new ListWidget().updateAll(LoyaltyCardViewActivity.this);
+
             // Re-init loyaltyCard with new data from DB
             onResume();
             invalidateOptionsMenu();
@@ -890,6 +892,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
 
             ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+            new ListWidget().updateAll(LoyaltyCardViewActivity.this);
 
             // Re-init loyaltyCard with new data from DB
             onResume();
@@ -915,6 +918,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 DBHelper.deleteLoyaltyCard(database, LoyaltyCardViewActivity.this, loyaltyCardId);
 
                 ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+                new ListWidget().updateAll(LoyaltyCardViewActivity.this);
 
                 finish();
                 dialog.dismiss();

app/src/main/java/protect/card_locker/MainActivity.java

@@ -2,6 +2,8 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.app.SearchManager;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -330,22 +332,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
 
         // Restore sort preferences from Shared Preferences
-        // If one of the sorting prefererences has never been set or is set to an invalid value,
-        // stick to the defaults.
-        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_sort),
-                Context.MODE_PRIVATE);
-
-        String orderString = sortPref.getString(getString(R.string.sharedpreference_sort_order), null);
-        String orderDirectionString = sortPref.getString(getString(R.string.sharedpreference_sort_direction), null);
-
-        if (orderString != null && orderDirectionString != null) {
-            try {
-                mOrder = DBHelper.LoyaltyCardOrder.valueOf(orderString);
-                mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(orderDirectionString);
-            } catch (IllegalArgumentException ignored) {
-            }
-        }
+        mOrder = Utils.getLoyaltyCardOrder(this);
+        mOrderDirection = Utils.getLoyaltyCardOrderDirection(this);
 
         mGroup = null;
 
@@ -442,6 +430,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         if (mCurrentActionMode != null) {
             mCurrentActionMode.finish();
         }
+
+        new ListWidget().updateAll(mAdapter.mContext);
     }
 
     private void processParseResultList(List<ParseResult> parseResultList, String group, boolean closeAppOnNoBarcode) {
@@ -709,6 +699,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                         showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
                 );
 
+                new ListWidget().updateAll(this);
+
                 dialog.dismiss();
             });
 

app/src/main/java/protect/card_locker/ManageGroupActivity.java

@@ -48,7 +48,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         super.onCreate(inputSavedInstanceState);
         binding = ActivityManageGroupBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
+        Utils.applyWindowInsetsAndFabOffset(binding.getRoot(), binding.fabSave);
         Toolbar toolbar = binding.toolbar;
         setSupportActionBar(toolbar);
 

app/src/main/java/protect/card_locker/PkpassParser.kt

@@ -67,8 +67,17 @@ class PkpassParser(context: Context, uri: Uri?) {
         try {
             mContext.contentResolver.openInputStream(uri).use { inputStream ->
                 ZipInputStream(inputStream).use { zipInputStream ->
-                    var localFileHeader: LocalFileHeader
-                    while ((zipInputStream.nextEntry.also { localFileHeader = it }) != null) {
+                    var localFileHeader: LocalFileHeader?
+
+                    while (true) {
+                        // Retrieve the next file
+                        localFileHeader = zipInputStream.nextEntry
+
+                        // If no next file, exit loop
+                        if (localFileHeader == null) {
+                            break
+                        }
+
                         // Ignore directories
                         if (localFileHeader.isDirectory) continue
 

app/src/main/java/protect/card_locker/Utils.java

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -50,6 +51,7 @@ import androidx.palette.graphics.Palette;
 
 import com.google.android.material.color.DynamicColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
@@ -594,6 +596,11 @@ public class Utils {
         double width = bitmap.getWidth();
         double height = bitmap.getHeight();
 
+        // Early exit
+        if (Math.max(width, height) <= maxSize) {
+            return bitmap;
+        }
+
         if (height > width) {
             double scale = height / maxSize;
             height = maxSize;
@@ -1134,6 +1141,27 @@ public class Utils {
             return WindowInsetsCompat.CONSUMED;
         });
     }
+    
+    public static void applyWindowInsetsAndFabOffset(View root, FloatingActionButton fab) {
+        /* This function is a copy of applyWindowInsets, with the added behaviour that it ensures the FAB will be displayed vertically above the keyboard at all times */
+        ViewCompat.setOnApplyWindowInsetsListener(root, (view, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            
+            ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+            layoutParams.leftMargin = insets.left;
+            layoutParams.bottomMargin = insets.bottom;
+            layoutParams.rightMargin = insets.right;
+            layoutParams.topMargin = insets.top;
+            view.setLayoutParams(layoutParams);
+            
+            // This is required to move the FAB above the keyboard when keyboard is open
+            Insets imeInsets = windowInsets.getInsets(WindowInsetsCompat.Type.ime());
+            boolean isKeyboardVisible = windowInsets.isVisible(WindowInsetsCompat.Type.ime());
+            fab.setTranslationY(isKeyboardVisible ? (- imeInsets.bottom) : 0);
+            
+            return WindowInsetsCompat.CONSUMED;
+        });
+    }
 
     public static ImageView.ScaleType getRecommendedScaleTypeForThumbnailImage(@Nullable Bitmap image) {
         // Return something sensible if no image
@@ -1149,4 +1177,40 @@ public class Utils {
 
         return ImageView.ScaleType.FIT_CENTER;
     }
+
+    public static DBHelper.LoyaltyCardOrder getLoyaltyCardOrder(Context context) {
+        SharedPreferences sortPref = context.getSharedPreferences(
+                "sharedpreference_sort",
+                Context.MODE_PRIVATE
+        );
+
+        String orderString = sortPref.getString("sharedpreference_sort_order", null);
+
+        if (orderString != null) {
+            try {
+                return DBHelper.LoyaltyCardOrder.valueOf(orderString);
+            } catch (IllegalArgumentException ignored) {
+            }
+        }
+
+        return DBHelper.LoyaltyCardOrder.Alpha;
+    }
+
+    public static DBHelper.LoyaltyCardOrderDirection getLoyaltyCardOrderDirection(Context context) {
+        SharedPreferences sortPref = context.getSharedPreferences(
+                "sharedpreference_sort",
+                Context.MODE_PRIVATE
+        );
+
+        String orderDirectionString = sortPref.getString("sharedpreference_sort_direction", null);
+
+        if (orderDirectionString != null) {
+            try {
+                return DBHelper.LoyaltyCardOrderDirection.valueOf(orderDirectionString);
+            } catch (IllegalArgumentException ignored) {
+            }
+        }
+
+        return DBHelper.LoyaltyCardOrderDirection.Ascending;
+    }
 }

app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z"
+      android:fillColor="#1F4262"/>
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -3,69 +3,57 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="1.5307087"
-      android:scaleY="1.5307087"
-      android:translateX="15.12"
-      android:translateY="15.12">
+  <group android:scaleX="0.75"
+      android:scaleY="0.75"
+      android:translateX="13.5"
+      android:translateY="13.5">
     <path
-        android:pathData="M14.3354,20.1954l20.7318,-9.2304l5.7612,12.9398l-20.7318,9.2304z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#f0f0f0"
-        android:strokeColor="#c80000"/>
+        android:pathData="M45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28L49.6,41.85L45.5,30.58Z"
+        android:fillColor="#F5A3A3"/>
     <path
-        android:pathData="M14.8755,10.9648l23.2041,10.3311l-6.8874,15.4694l-23.2041,-10.3311z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#f0f0f0"
-        android:strokeColor="#c80000"/>
+        android:pathData="M70.36,25.78C70.17,25.27 69.6,25 69.08,25.19L49.35,32.37L51.4,38.01L72.07,30.48L70.36,25.78ZM75.92,32.28L49.6,41.85L45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28Z"
+        android:fillColor="#CF1717"/>
     <path
-        android:pathData="M16.5599,16.1348l26.5459,7.6119l-4.5489,15.8639l-26.5459,-7.6119z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="1.5875"
-        android:fillColor="#c80000"
-        android:strokeColor="#c80000"
-        android:fillType="evenOdd"/>
+        android:pathData="M58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28L54.31,41.85L58.42,30.58Z"
+        android:fillColor="#F5A3A3"/>
     <path
-        android:pathData="M12.011,15.4955h27.6157v16.5032h-27.6157z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="1.5875"
-        android:fillColor="#ff0000"
-        android:strokeColor="#ff0000"
-        android:fillType="evenOdd"/>
+        android:pathData="M33.56,25.78C33.74,25.27 34.32,25 34.84,25.19L54.57,32.37L52.52,38.01L31.84,30.48L33.56,25.78ZM28,32.28L54.31,41.85L58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28Z"
+        android:fillColor="#DD1818"/>
     <path
-        android:pathData="M7.8471,23.7471a4.3659,8.5899 0,1 0,8.7317 0a4.3659,8.5899 0,1 0,-8.7317 0z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="0.91078"
-        android:fillColor="#ff0000"
-        android:strokeColor="#ff0000"/>
+        android:pathData="M28.7,37.6C29.08,35.42 31.15,33.97 33.33,34.35L80.6,42.69C82.78,43.07 84.23,45.15 83.85,47.32L81.82,58.83C82.3,59.1 84.67,60.16 87.42,57.23V57.23C87.92,56.69 88.45,56.23 89.01,55.86C91.76,54.02 94,55.22 94,58.53C94,61.34 92.39,64.78 90.21,66.88C86.63,70.54 80.69,70.56 79.75,70.53L77.59,82.78C77.21,84.95 75.14,86.4 72.96,86.02L25.69,77.69C25.67,77.68 25.66,77.68 25.64,77.68C23.45,77.32 22,76.7 22,76C22,75.72 22.23,75.45 22.66,75.2C22.4,74.54 22.31,73.8 22.44,73.05L28.7,37.6Z"
+        android:fillColor="#B81414"/>
     <path
-        android:pathData="m24.4983,25.781a1.6711,1.6711 0,0 1,-1.3809 1.6457,1.6711 1.6711,0 0,1 -1.8605,-1.0741"
-        android:strokeLineJoin="round"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="round"/>
+        android:pathData="M90.67,60.75C90.67,61.85 89.93,63.24 89.01,63.86C88.09,64.47 87.34,64.07 87.34,62.97C87.34,61.86 88.09,60.47 89.01,59.86C89.93,59.24 90.67,59.64 90.67,60.75Z"
+        android:fillColor="#E82E2E"/>
     <path
-        android:pathData="m27.7991,26.333a1.6711,1.6711 0,0 1,-1.8605 1.0741,1.6711 1.6711,0 0,1 -1.3809,-1.6457"
-        android:strokeLineJoin="round"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="round"/>
+        android:pathData="M78,30C80.21,30 82,31.79 82,34V70C82,72.21 80.21,74 78,74H30C25.58,74 22,74.9 22,76V32C22,30.9 25.58,30 30,30H78Z"
+        android:fillColor="#E82E2E"/>
     <path
-        android:pathData="m16.0606,22.271 l2.6458,-2.6458 2.6458,2.6458"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="butt"/>
+        android:pathData="M51.2,54.25C51.62,53.53 52.53,53.29 53.25,53.7C53.94,54.1 54.2,54.98 53.84,55.68L53.76,55.82C53.4,56.52 53.65,57.4 54.35,57.8C55.04,58.2 55.93,57.98 56.36,57.32L56.44,57.18C56.87,56.52 57.75,56.3 58.45,56.7C59.16,57.12 59.41,58.03 58.99,58.75C57.75,60.9 55,61.64 52.85,60.4C50.7,59.15 49.96,56.4 51.2,54.25Z"
+        android:fillColor="#8A0F0F"/>
     <path
-        android:pathData="m27.7023,22.271 l2.6458,-2.6458 2.6458,2.6458"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.529167"
-        android:fillColor="#00000000"
-        android:strokeColor="#f0f0f0"
-        android:strokeLineCap="butt"/>
+        android:pathData="M52.79,54.25C52.38,53.53 51.46,53.29 50.75,53.7C50.05,54.1 49.8,54.98 50.16,55.68L50.23,55.82C50.6,56.52 50.34,57.4 49.65,57.8C48.95,58.2 48.07,57.98 47.64,57.32L47.56,57.18C47.13,56.52 46.24,56.3 45.55,56.7C44.83,57.12 44.59,58.03 45,58.75C46.24,60.9 49,61.64 51.15,60.4C53.3,59.15 54.04,56.4 52.79,54.25Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M53.3,56.75C52.72,57.75 51.28,57.75 50.7,56.75L48.1,52.25C47.53,51.25 48.25,50 49.4,50L54.6,50C55.75,50 56.47,51.25 55.9,52.25L53.3,56.75Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M40.5,40.5C43.73,40.5 46.46,42.62 47.42,45.53C47.68,46.31 47.26,47.16 46.47,47.42C45.69,47.68 44.84,47.26 44.58,46.47C44,44.73 42.38,43.5 40.5,43.5C38.62,43.5 37,44.73 36.42,46.47C36.16,47.26 35.31,47.68 34.53,47.42C33.74,47.16 33.32,46.31 33.58,45.53C34.54,42.62 37.27,40.5 40.5,40.5Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M63.5,40.5C66.73,40.5 69.46,42.62 70.42,45.53C70.68,46.31 70.26,47.16 69.47,47.42C68.69,47.68 67.84,47.26 67.58,46.47C67,44.73 65.38,43.5 63.5,43.5C61.62,43.5 60,44.73 59.42,46.47C59.16,47.26 58.31,47.68 57.53,47.42C56.74,47.16 56.32,46.31 56.58,45.53C57.54,42.62 60.27,40.5 63.5,40.5Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M26,55C25.45,55 25,54.55 25,54C25,53.45 25.45,53 26,53H42C42.55,53 43,53.45 43,54C43,54.55 42.55,55 42,55H26Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M26.35,60.94C25.83,61.13 25.26,60.87 25.06,60.35C24.87,59.83 25.13,59.26 25.65,59.06L41.65,53.06C42.17,52.87 42.74,53.13 42.94,53.65C43.13,54.17 42.87,54.74 42.35,54.94L26.35,60.94Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M61.65,54.94C61.13,54.74 60.87,54.17 61.06,53.65C61.26,53.13 61.83,52.87 62.35,53.06L78.35,59.06C78.87,59.26 79.13,59.83 78.94,60.35C78.74,60.87 78.17,61.13 77.65,60.94L61.65,54.94Z"
+        android:fillColor="#8A0F0F"/>
+    <path
+        android:pathData="M78,55C78.55,55 79,54.55 79,54C79,53.45 78.55,53 78,53H62C61.45,53 61,53.45 61,54C61,54.55 61.45,55 62,55H78Z"
+        android:fillColor="#8A0F0F"/>
   </group>
 </vector>

app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -3,25 +3,34 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M53.26,40.92l14.35,-6.39l2.86,6.42"
-      android:strokeAlpha="0.4"
-      android:fillAlpha="0.4"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M36.14,40.95l2.86,-6.42l14.24,6.34"
-      android:strokeAlpha="0.4"
-      android:fillAlpha="0.4"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M40.01,37.17l7.73,3.44H38.48l1.53,-3.44m26.58,0 l1.53,3.44H58.86l7.73,-3.44M39,34.53l-2.86,6.42v1.66H70.47V40.95L67.61,34.53 53.27,40.92l-0.02,-0.05L39,34.53Z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M74.07,51.23l4.93,1.41l-6.44,22.48l-37.61,-10.79l39.13,0l0,-13.11z"
-      android:strokeAlpha="0.7"
-      android:fillAlpha="0.7"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M34.94,40.95C31.66,40.95 29,46.19 29,52.64s2.66,11.69 5.94,11.69L74.07,64.34L74.07,40.95ZM41.21,51.08 L40.15,50.02 44.43,45.74 48.71,50.02 47.65,51.08 44.43,47.86ZM58.02,56.56a3.11,3.11 0,0 1,-2.93 2.05,3.15 3.15,0 0,1 -0.55,-0.05 3.11,3.11 0,0 1,-1.83 -1.04,3.12 3.12,0 0,1 -5.3,-0.96 0.75,0.75 0,0 1,1.41 -0.51,1.62 1.62,0 0,0 3.14,-0.55 0.75,0.75 0,0 1,1.5 0,1.62 1.62,0 0,0 3.14,0.55 0.75,0.75 0,0 1,1.41 0.51ZM64.14,51.08 L60.92,47.86L57.71,51.08l-1.06,-1.06 4.28,-4.28 4.28,4.28Z"/>
+  <group android:scaleX="0.75"
+      android:scaleY="0.75"
+      android:translateX="13.5"
+      android:translateY="13.5">
+    <path
+        android:pathData="M75,31C78.31,31 81,33.69 81,37V44.43C81.83,45.67 82.2,47.22 81.92,48.81L81,54.01V55.87C81.24,55.72 81.5,55.51 81.79,55.22L81.86,55.14C82.38,54.59 82.96,54.08 83.58,53.67L83.72,53.57C85.2,52.64 87.03,52.17 88.68,53.05C90.37,53.96 90.99,55.83 90.99,57.63L90.99,57.77C90.94,60.78 89.29,64.16 87.12,66.26L87.12,66.26C85.22,68.18 82.74,69.08 80.76,69.52C80.64,69.55 80.53,69.57 80.41,69.6C79.85,70.76 78.92,71.72 77.77,72.32L76.71,78.35C76.13,81.61 73.02,83.79 69.76,83.22L30.37,76.27C30.33,76.27 30.29,76.26 30.26,76.25C29.12,76.09 28.06,75.84 27.22,75.49C26.8,75.32 26.33,75.07 25.93,74.72C25.54,74.37 25.01,73.72 25,72.78C25,72.78 25,72.78 25,72.78C25,72.77 25,72.76 25,72.75V34.5C25,33.84 25.32,33.25 25.82,32.89C26.23,32.49 26.7,32.24 27.04,32.09C27.6,31.83 28.27,31.63 28.97,31.48C29.75,31.31 30.64,31.18 31.59,31.1C31.59,31.1 31.58,31.1 31.57,31.1L32.67,28.07L32.73,27.93C33.91,24.91 37.3,23.37 40.36,24.49L52.83,29.03L65.3,24.49C68.42,23.36 71.86,24.96 73,28.07L74.06,31H75ZM34.85,73L70.45,79.28C71.54,79.47 72.58,78.74 72.77,77.66L73.59,73H34.85ZM34,35C32.35,35 30.88,35.15 29.82,35.39C29.48,35.46 29.21,35.54 29,35.61V69.47C30.4,69.17 32.15,69 34,69H75L75.1,69C76.13,68.95 76.95,68.13 77,67.1L77,67V37C77,35.9 76.1,35 75,35H34ZM86.78,56.59C86.68,56.59 86.4,56.61 85.88,56.94L85.8,56.99C85.47,57.21 85.13,57.51 84.78,57.88C84.78,57.88 84.78,57.88 84.78,57.88L84.64,58.03C83.44,59.25 82.18,59.88 81,60.12V65.32C82.2,64.94 83.35,64.36 84.22,63.5L84.34,63.38C85.88,61.89 86.99,59.43 86.99,57.63L86.99,57.53C86.98,56.92 86.84,56.67 86.78,56.59ZM46.56,31L38.99,28.25C37.99,27.88 36.88,28.37 36.47,29.35L36.43,29.44L35.86,31H46.56ZM69.8,31L69.24,29.44C68.86,28.41 67.71,27.87 66.67,28.25L59.11,31H69.8Z"
+        android:fillColor="#000000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M55.17,51C56.32,51 57.04,52.25 56.46,53.25L54.69,56.31C54.6,56.76 54.79,57.24 55.21,57.48C55.73,57.78 56.39,57.6 56.69,57.08C57.11,56.37 58.02,56.12 58.74,56.53C59.46,56.95 59.7,57.87 59.29,58.58C58.16,60.54 55.67,61.21 53.71,60.08C53.45,59.93 53.21,59.75 53,59.55C52.78,59.75 52.54,59.93 52.28,60.08C50.33,61.21 47.83,60.54 46.7,58.58C46.29,57.87 46.53,56.95 47.25,56.53C47.97,56.12 48.88,56.37 49.3,57.08C49.6,57.6 50.26,57.78 50.78,57.48C51.2,57.23 51.4,56.74 51.29,56.29L49.54,53.25C48.96,52.25 49.68,51 50.83,51H55.17Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M43.25,42.5C46,42.5 48.48,44.07 49.4,46.46C49.7,47.24 49.31,48.1 48.54,48.4C47.76,48.7 46.9,48.31 46.6,47.54C46.18,46.44 44.91,45.5 43.25,45.5C41.58,45.5 40.32,46.44 39.9,47.54C39.6,48.31 38.74,48.7 37.96,48.4C37.19,48.1 36.8,47.24 37.1,46.46C38.02,44.07 40.5,42.5 43.25,42.5Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M62.75,42.5C65.5,42.5 67.98,44.07 68.9,46.46C69.2,47.24 68.81,48.1 68.04,48.4C67.26,48.7 66.4,48.31 66.1,47.54C65.68,46.44 64.41,45.5 62.75,45.5C61.08,45.5 59.82,46.44 59.4,47.54C59.1,48.31 58.24,48.7 57.46,48.4C56.69,48.1 56.3,47.24 56.6,46.46C57.52,44.07 60,42.5 62.75,42.5Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M33,55C32.17,55 31.5,54.33 31.5,53.5C31.5,52.67 32.17,52 33,52H44.25C45.08,52 45.75,52.67 45.75,53.5C45.75,54.33 45.08,55 44.25,55H33Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M33.61,59.87C32.85,60.21 31.97,59.87 31.63,59.11C31.29,58.35 31.63,57.47 32.39,57.13L43.61,52.13C44.37,51.79 45.26,52.13 45.59,52.89C45.93,53.65 45.59,54.53 44.83,54.87L33.61,59.87Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M60.85,54.88C60.09,54.55 59.74,53.66 60.07,52.9C60.4,52.14 61.28,51.79 62.04,52.12L73.6,57.12C74.36,57.45 74.71,58.34 74.38,59.1C74.05,59.86 73.16,60.21 72.4,59.88L60.85,54.88Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M73,52C73.83,52 74.5,52.67 74.5,53.5C74.5,54.33 73.83,55 73,55H61.5C60.67,55 60,54.33 60,53.5C60,52.67 60.67,52 61.5,52H73Z"
+        android:fillColor="#000000"/>
+  </group>
 </vector>

app/src/main/res/layout/list_widget.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <!-- android:columnWidth must be kept in sync with list_widget_item.xml -->
+    <GridView
+        android:id="@+id/grid_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:numColumns="auto_fit"
+        android:columnWidth="107dp"
+        android:verticalSpacing="4dp"
+        android:horizontalSpacing="4dp"
+        android:gravity="center"/>
+</LinearLayout>

app/src/main/res/layout/list_widget_empty.xml

@@ -0,0 +1,17 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/widget_layout"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/no_cards_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/card_list_widget_empty"
+        app:autoSizeTextType="uniform"
+        app:autoSizeMinTextSize="12sp"
+        app:autoSizeMaxTextSize="100sp"
+        app:autoSizeStepGranularity="2sp" />
+</LinearLayout>

app/src/main/res/layout/list_widget_item.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+85.6dp : 53.98dp
+Both multiplied by 1.25 to fit better
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="107dp"
+    android:layout_height="67.475dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:id="@+id/item_container"
+    android:background="@drawable/round_outline"
+    android:clipToOutline="true">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/item_container_foreground">
+
+        <ImageView
+            android:id="@+id/item_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|center" />
+
+        <TextView
+            android:id="@+id/item_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:autoSizeMinTextSize="6sp"
+            app:autoSizeTextType="uniform"
+            android:layout_gravity="center|center"
+            android:gravity="center" />
+    </FrameLayout>
+</FrameLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/raw/contributors.txt

@@ -16,62 +16,64 @@ Altonss
 B o d o
 Michael Moroni
 Eric
+Joel A
+Silvério Santos
 Максим Горпиніч
 GM
+Priit Jõerüüt
 laralem
 Petr Novák
-Joel A
-Priit Jõerüüt
-Taco
 Edgars Andersons
+Taco
 nadiafekihahmed
 pfaffenrodt
 Aayush Gupta
 Scrambled777
-Silvério Santos
 ikanakova
 Giovanni Donisi
 HudobniVolk
 Jiri Grönroos
 Nyatsuki
-Balázs Meskó
-Milo Ivir
 josé m
 Samantaz Fox
+Balázs Meskó
+Milo Ivir
+Fjuro
 Cliff Heraldo
 Sergio Paredes
 Ankit Tiwari
 Arno-github
+Warder
+Kachelkaiser
 Jose Delvani
 mdvhimself
 Milan Šalka
-Kachelkaiser
+GitSpoon
 Skrripy
+Vasilis
 huuhaa
 தமிழ் நேரம்
 waffshappen
 Marnick L'Eau
 ngocanhtve
-Vasilis
+StellarSand
 Quentin PAGÈS
 Projjal Moitra
 Robin
 JungHee Lee
+hajertabbane
 Ziad OUALHADJ
 Robin Liu
+Ricky Tigg
 Renko
 Denis Shilin
 しいたけ
 Alexander Ivanov
-Fjuro
 Miha Frangež
-Viet Nguyen Hoang
 stavpup
-hajertabbane
 ehrt74
 Virginie
 Tim Trek
-Ricky Tigg
 Peter Dave Hello
 Michael Gangolf
 rudy3
@@ -80,5 +82,5 @@ Govind S Nair
 Freddo espresso
 Augustin LAVILLE
 arshbeerSingh
-Aliaksandr Trush
 MisterCosta96
+Aliaksandr Trush

app/src/main/res/values-ar/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">بحث</string>
     <string name="action_add">أضف</string>
-    <string name="noGiftCards">اضغط على زر الإضافة+ لإضافة بطاقة، أو استورد من ⋮ القائمة.</string>
+    <string name="noGiftCards">اضغط على زر الإضافة + لإضافة بطاقة، أو استورد من ⋮ القائمة.</string>
     <string name="noMatchingGiftCards">لا نتائج. حاول تغيير كلمات البحث.</string>
     <string name="storeName">اسم</string>
     <string name="note">مذكرة</string>
@@ -44,9 +44,9 @@
     <string name="selectBarcodeTitle">اختار الباركود</string>
     <string name="thumbnailDescription">صورة مصغرة</string>
     <string name="starImage">نجم مفضل</string>
-    <string name="settings">اعدادات</string>
-    <string name="settings_light_theme">فاتح</string>
-    <string name="settings_dark_theme">داكن</string>
+    <string name="settings">الإعدادات</string>
+    <string name="settings_light_theme">فاتحة</string>
+    <string name="settings_dark_theme">داكنة</string>
     <string name="settings_card_orientation">اتجاه الشاشة</string>
     <string name="settings_portrait_orientation">الوضع الرأسي</string>
     <string name="settings_landscape_orientation">الوضع الأفقي</string>
@@ -63,7 +63,7 @@
     <string name="group_updated">تم تحديث المجموعة</string>
     <string name="all">الكل</string>
     <string name="deleteConfirmationGroup">هل تريد حذف المجموعة؟</string>
-    <string name="failedOpeningFileManager">قم بتثبيت مدير الملفات أولاً.</string>
+    <string name="failedOpeningFileManager">ثبِّت مدير الملفات أولاً.</string>
     <string name="moveUp">تحرك لأعلى</string>
     <string name="addFromImage">حدد صورة من المعرض</string>
     <string name="balance">الرصيد</string>
@@ -74,19 +74,16 @@
     <string name="privacy_policy">سياسة الخصوصية</string>
     <string name="accept">قبول</string>
     <string name="importCatima">الاستيراد من Catima</string>
-    <string name="importCatimaMessage">حدد ملفك <i>catima.zip</i> تصدير من Catima للاستيراد.
-\nقم بإنشائه من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير هناك أولاً.</string>
+    <string name="importCatimaMessage">حدّد ملفك <i>catima.zip</i> تصدير من Catima للاستيراد. \nإنشئها من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير هناك أولاً.</string>
     <string name="importFidme">الاستيراد من FidMe</string>
-    <string name="importFidmeMessage">حدد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد ، ثم حدد أنواع الباركود يدويًا بعد ذلك.
-\nقم بإنشائه من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
+    <string name="importFidmeMessage">حدّد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد، ثم حدد أنواع الباركود يدويًا بعد ذلك. \nإنشئها من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
     <string name="importStocardMessage">حدد ملفك <i>***.zip</i> تصدير من Stocard للاستيراد.
 \nاحصل عليه عن طريق إرسال بريد إلكتروني إلى support@stocardapp.com لطلب تصدير بياناتك.</string>
     <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
-    <string name="importVoucherVaultMessage">حدد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد.
-\nقم بإنشائه بالضغط على تصدير في Voucher Vault أولاً.</string>
+    <string name="importVoucherVaultMessage">حدّد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد. \nإنشئها بالضغط على تصدير في Voucher Vault أولاً.</string>
     <string name="barcodeId">قيمة الباركود</string>
     <string name="sameAsCardId">نفس بطاقة الهوية</string>
-    <string name="setBarcodeId">قم بتعيين قيمة الباركود</string>
+    <string name="setBarcodeId">عيّن قيمة الباركود</string>
     <string name="unsupportedBarcodeType">لا يمكن عرض نوع الباركود هذا. قد يكون مدعومًا في إصدار أحدث من التطبيق.</string>
     <string name="wrongValueForBarcodeType">القيمة غير صالحة لنوع الباركود المحدد</string>
     <string name="intent_import_card_from_url_share_multiple_text">أريد مشاركة بعض البطاقات معك</string>
@@ -102,9 +99,9 @@
     <string name="yes">نعم</string>
     <string name="no">لا</string>
     <string name="passwordRequired">الرجاء إدخال كلمة المرور</string>
-    <string name="exportPassword">قم بتعيين كلمة مرور لحماية التصدير (اختياري)</string>
+    <string name="exportPassword">عيّن كلمة مرور لحماية التصدير (اختياري)</string>
     <string name="exportPasswordHint">أدخل كلمة المرور</string>
-    <string name="turn_flashlight_on">قم بتشغيل المصباح</string>
+    <string name="turn_flashlight_on">شغّل المصباح</string>
     <string name="turn_flashlight_off">أطفئ المصباح</string>
     <string name="settings_locale">لغة</string>
     <string name="settings_system_locale">النظام</string>
@@ -131,7 +128,7 @@
     <string name="shortcutSelectCard">اختر بطاقة</string>
     <string name="options">خيارات</string>
     <string name="starred">مميز بنجمة</string>
-    <string name="include_if_asking_support">إذا كنت ترغب في طلب الدعم ، فقم بتضمين المعلومات التالية:</string>
+    <string name="include_if_asking_support">إذا كنت ترغب في طلب الدعم، ضمّن المعلومات التالية:</string>
     <string name="duplicateCard">كرر</string>
     <string name="archive">ضع الي الأرشيف</string>
     <string name="unarchive">أخرج من الأرشيف</string>
@@ -185,7 +182,7 @@
     <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات.</string>
     <string name="about_title_fmt">حول <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">نسخة: <xliff:g id="version">%s</xliff:g></string>
-    <string name="settings_system_theme">نظام</string>
+    <string name="settings_system_theme">النظام</string>
     <string name="settings_lock_on_opening_orientation">قفل على الاتجاه عند فتح البطاقة</string>
     <string name="app_resources">موارد الطرف الثالث الحرة: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="settings_follow_system_orientation">نظام المتابعة</string>
@@ -231,8 +228,7 @@
     <string name="report_error">الإبلاغ عن خطأ</string>
     <string name="sort_by_expiry">انقضاء</string>
     <string name="importLoyaltyCardKeychain">الاستيراد من Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">حدد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد.
-\nقم بإنشائه من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
+    <string name="importLoyaltyCardKeychainMessage">حدّد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد. \nإنشئها من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
     <string name="importStocard">الاستيراد من Stocard</string>
     <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة. الرجاء الإبلاغ عن هذا.</string>
     <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
@@ -243,7 +239,7 @@
     <string name="failedToRetrieveImageFile">فشل في استخراج ملف الصورة</string>
     <string name="barcodeLongPressMessage">يمكن فتح صور فقط في تطبيق معرض الصور</string>
     <string name="failedToOpenUrl">ثبت متصفح ويب أولاً</string>
-    <string name="welcome">مرحبا بك في كاتيما</string>
+    <string name="welcome">مرحبًا بك في كاتيما</string>
     <string name="updateBalanceTitle">كم أنفقت أو استلمت؟</string>
     <string name="currentBalanceSentence">الرصيد الحالي: <xliff:g> %s </xliff:g></string>
     <string name="importCards">استيراد البطاقات</string>
@@ -282,7 +278,7 @@
     <string name="setBarcodeHeight">ضبط ارتفاع الباركود</string>
     <string name="openBackImageInGalleryApp">فتح الصورة الخلفية في تطبيق المعرض</string>
     <string name="settings_allow_content_provider_read_title">السماح للتطبيقات الأخرى بالوصول إلى بياناتي</string>
-    <string name="donate">يتبرع</string>
+    <string name="donate">تبرّع</string>
     <string name="show_archived_cards">عرض البطاقات المؤرشفة</string>
     <string name="settings_category_title_privacy">خصوصية</string>
     <string name="show_balance">إظهار التوازن</string>
@@ -313,11 +309,11 @@
     <string name="exportCancelled">تم الغاء الاستخراج</string>
     <string name="useFrontImage">استخدام صورة أمامية</string>
     <string name="useBackImage">استخدم صورة خلفية</string>
-    <string name="addFromPkpass">اختر ملف الدفتر(.pkpass)</string>
+    <string name="addFromPkpass">اختر ملف الدفتر (.pkpass)</string>
     <string name="unsupportedFile">هذا الملف غير مدعوم</string>
     <string name="generic_error_please_retry">نعتذر، حدث خطأ ما، حاول مرة أخرى...</string>
-    <string name="settings_use_volume_keys_navigation">تبديل البطاقات باستخدام أزرار الصوت</string>
-    <string name="settings_use_volume_keys_navigation_summary">تبديل البطاقات الظاهرة باستخدام أزرار الصوت</string>
+    <string name="settings_use_volume_keys_navigation">بدّل البطاقات باستخدام أزرار الصوت</string>
+    <string name="settings_use_volume_keys_navigation_summary">بدّل البطاقات الظاهرة باستخدام أزرار الصوت</string>
     <string name="settings_category_title_cards_overview">نظرة عامة على البطاقات</string>
     <string name="settings_column_count_portrait">الأعمدة في الوضع الرأسي</string>
     <string name="settings_column_count_landscape">الأعمدة في الوضع الأفقي</string>

app/src/main/res/values-bg/strings.xml

@@ -308,4 +308,6 @@
     <string name="sort_by_valid_from">Начало валидност</string>
     <string name="width">Ширина</string>
     <string name="setBarcodeWidth">Задаване ширина на щрих кода</string>
+    <string name="card_list_widget_name">Списък с карти</string>
+    <string name="card_list_widget_empty">Когато добавите карти в Catima те ще се покажат тук. Ако имате карти уверете се, че са извън архива.</string>
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -314,4 +314,6 @@
     <string name="sort_by_valid_from">Platnost od</string>
     <string name="setBarcodeWidth">Nastavit šířku čárového kódu</string>
     <string name="width">Šířka</string>
+    <string name="card_list_widget_name">Seznam karet</string>
+    <string name="card_list_widget_empty">Karty přidané do aplikace Catima se zobrazí zde. Pokud máte karty, ujistěte se, že nejsou všechny archivovány.</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -101,7 +101,7 @@
     <string name="importLoyaltyCardKeychain">Aus Loyalty Card Keychain importieren</string>
     <string name="importFidmeMessage">Wähle deinen <i>fidme-export-request-xxxxxx.zip</i>-Export aus FidMe zum Importieren aus und wähle anschließend die Barcodetypen manuell aus. \nOder erstelle ihn aus deinem FidMe-Profil, indem du Datenschutz wählst und dann zuerst auf Meine Daten extrahieren drückst.</string>
     <string name="importFidme">Aus FidMe importieren</string>
-    <string name="importCatimaMessage">Wähle deinen <i>catima.zip</i>-Export aus Catima zum Importieren aus.\nErstelle ihn aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem du dort zuerst Export drückst.</string>
+    <string name="importCatimaMessage">Wähle deinen „<i>catima.zip</i>-Export“ von Catima zum Importieren aus.\nErstelle ihn zuerst aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem du dort Export drückst.</string>
     <string name="importCatima">Aus Catima importieren</string>
     <string name="setBarcodeId">Barcodewert festlegen</string>
     <string name="sameAsCardId">Entspricht Kartennummer</string>
@@ -304,4 +304,6 @@
     <string name="sort_by_valid_from">Gültig ab</string>
     <string name="width">Breite</string>
     <string name="setBarcodeWidth">Barcodebreite einstellen</string>
+    <string name="card_list_widget_empty">Nachdem du einige Treuekarten in Catima hinzugefügt hast, werden sie hier angezeigt. Wenn du Karten hast, stelle sicher, dass sie nicht alle archiviert sind.</string>
+    <string name="card_list_widget_name">Kartenliste</string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -307,4 +307,6 @@
     <string name="sort_by_valid_from">Έναρξη ισχύος</string>
     <string name="setBarcodeWidth">Ορισμός πλάτους γραμμωτού κώδικα</string>
     <string name="width">Πλάτος</string>
+    <string name="card_list_widget_empty">Αφού προσθέσετε μερικές κάρτες επιβράβευσης στο Catima, θα εμφανιστούν εδώ. Εάν έχετε κάρτες, βεβαιωθείτε ότι δεν είναι όλες αρχειοθετημένες.</string>
+    <string name="card_list_widget_name">Λίστα καρτών</string>
 </resources>

app/src/main/res/values-es-rAR/strings.xml

@@ -44,12 +44,12 @@
     <plurals name="deleteCardsTitle">
         <item quantity="one">Borrar <xliff:g>%d</xliff:g> tajeta</item>
         <item quantity="many">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">¿Borrar esta<xliff:g>%d</xliff:g> tarjeta de forma permanente\?</item>
         <item quantity="many">Borrar estas <xliff:g>%d</xliff:g> tarjetas de forma permanente\?</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <string name="failedOpeningFileManager">Primero instale un administrador de archivos.</string>
     <string name="intent_import_card_from_url_share_multiple_text">Quiero compartirte algunas tarjetas</string>
@@ -158,19 +158,19 @@
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> tarjeta</item>
         <item quantity="many"><xliff:g>%d</xliff:g> tarjetas</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> seleccionado</item>
         <item quantity="many"><xliff:g>%d</xliff:g> seleccionados</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <string name="importCatimaMessage">Seleccione su <i>catima.zip</i> exportado desde Catima para importarlo.
 \nPrimero créelo desde el menu para Importar/Exportar de otra aplicación de Catima presionando la opción Exportar.</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> punto</item>
         <item quantity="many"><xliff:g>%s</xliff:g> puntos</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <string name="importFidmeMessage">Seleccione su <i>fidme-export-request-xxxxxx.zip</i> exportado de FidMe para importarlo, y a continuación seleccione manualmente los tipos de código de barras.
 \nPrimero créelo desde su perfil de FidMe al elegir la opción Protección de Datos y presionando Extraer mis datos.</string>

app/src/main/res/values-es/strings.xml

@@ -314,4 +314,6 @@
     <string name="sort_by_valid_from">Válido desde</string>
     <string name="setBarcodeWidth">Establecer el ancho del código de barras</string>
     <string name="width">Ancho</string>
+    <string name="card_list_widget_name">Lista de tarjetas</string>
+    <string name="card_list_widget_empty">Después de añadir algunas tarjetas de fidelidad en Catima, aparecerán aquí. Si tienes tarjetas, asegúrate de que no estén archivadas.</string>
 </resources>

app/src/main/res/values-et/strings.xml

@@ -175,7 +175,7 @@
     <string name="points">Punkte</string>
     <string name="balanceParsingFailed">Vigane maksejääk</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="privacy_policy">Privaatsuspoliitika</string>
+    <string name="privacy_policy">Andmekaitsepõhimõtted</string>
     <string name="accept">Nõustu</string>
     <string name="importCatima">Impordi Catima varukoopiast</string>
     <string name="importCatimaMessage">Importimiseks vali varem tehtud <i>catima.zip</i> Catima ekspordifail. \nSellise faili saad luua mõnes teises seadmes olevast Catima rakendusest Import/Eksport menüüst valikust Eksport.</string>
@@ -303,4 +303,6 @@
     <string name="sort_by_valid_from">Kehtib alates</string>
     <string name="setBarcodeWidth">Määratle triipkoodi laius</string>
     <string name="width">Laius</string>
+    <string name="card_list_widget_name">Kaartide loend</string>
+    <string name="card_list_widget_empty">Kui lisad Catimasse kliendikaarte, siis saavad nad olema nähtavad siin. Kui sul on kaardid lisatud, siis palun kontrolli, et nad kõik poleks arhiveeritud.</string>
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -71,7 +71,7 @@
     <string name="importExport">ایمپورت/خروجی گرفتن</string>
     <string name="settings_category_title_privacy">حریم شخصی</string>
     <string name="settings_category_title_general">عمومی</string>
-    <string name="settings_category_title_cards">کارت‌ها</string>
+    <string name="settings_category_title_cards">نمایش کارت</string>
     <string name="barcodeImageDescriptionWithType">تصویر بارکد <xliff:g>%s</xliff:g></string>
     <string name="importOptionFilesystemButton">از فایل های سیستم</string>
     <string name="about">درباره</string>
@@ -112,7 +112,7 @@
     <string name="about_title_fmt">درباره <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">نسخه <xliff:g id="version">%s</xliff:g></string>
     <string name="chooseExpiryDate">انتخاب تاریخ انقضاء</string>
-    <string name="app_libraries">کتابخانه های شخص ثالث: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_libraries">کتابخانه های آزاد شخص ثالث: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_old">بر اساس کارت وفاداری Keychain\nکپی رایت © 2016-2020 سازنده : Branden</string>
     <string name="app_license">نرم‌افزار آزاد با حقوق کپی‌لفت، تحت مجوز GPLv3+</string>
     <string name="groups">گروه‌ها</string>
@@ -188,4 +188,118 @@
     <string name="height">ارتفاع</string>
     <string name="add_manually_warning_message">برای برخی از فروشگاه‌ها، مقدار بارکد با عدد نوشته شده روی کارت متفاوت است. به همین دلیل، وارد کردن دستی بارکد ممکن است همیشه کار نکند. اکیداً توصیه می‌شود که به جای آن، بارکد را با دوربین خود اسکن کنید. آیا هنوز می‌خواهید ادامه دهید؟</string>
     <string name="generic_error_please_retry">ببخشید، مشکلی پیش آمده، لطفا دوباره امتحان کنید...</string>
+    <string name="settings_magenta_theme">سرخابی</string>
+    <string name="welcome">یه کتیما خوش آمدید</string>
+    <string name="chooseValidFromDate">مقداری درست از تاریخ برگزینید</string>
+    <string name="intent_import_card_from_url_share_multiple_text">می‌خواهم چند کارت به شما بدهم</string>
+    <string name="frontImageDescription">عکس نمایه</string>
+    <string name="backImageDescription">عکس پشتِ‌سر</string>
+    <string name="photos">عکس‌ها</string>
+    <string name="setFrontImage">عکس روبه‌رو را بگذارید</string>
+    <string name="yes">بله</string>
+    <string name="no">نه</string>
+    <string name="updateBarcodeQuestionTitle">مقدار بارکد را به‌روز می‌کنید؟</string>
+    <string name="updateBarcodeQuestionText">شما شناسه را تغییر دادید. می‌خواهید بارکد را هم به‌روز کنید تا همین مقدار را به‌کار ببرید؟</string>
+    <string name="failedGeneratingShareURL">نتوانستم آدرس هم‌رسانی‌پذیر بسازم. لطفن این را گزارش کنید.</string>
+    <string name="turn_flashlight_on">چراغ‌قوه را روشن کنید</string>
+    <string name="settings_locale">زبان</string>
+    <string name="settings_oled_dark">پس‌زمینه‌ی یک‌دست سیاه برای حالت تاریک</string>
+    <string name="settings_oled_dark_summary">استفاده‌ی باتری را برای نمایشگرهای OLED کاهش می‌دهد</string>
+    <string name="setIcon">قالب پیش‌نمایه را بگمارید</string>
+    <string name="settings_theme_color">رنگ زمینه</string>
+    <string name="settings_catima_theme">کتیما</string>
+    <string name="settings_system_locale">سیستم</string>
+    <string name="selectColor">رنگ را برگزینید</string>
+    <string name="settings_violet_theme">بنفش</string>
+    <string name="settings_blue_theme">آبی</string>
+    <string name="settings_sky_blue_theme">آبی آسمانی</string>
+    <string name="settings_green_theme">سبز</string>
+    <string name="settings_brown_theme">قهوه‌ای</string>
+    <string name="app_contributors">با کمک او ممکن شد: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="sort">مرتب‌کردن</string>
+    <string name="showMoreInfo">نمایش اطلاعات</string>
+    <string name="credits">اعتبارها</string>
+    <string name="archived">کارت بایگانی شد</string>
+    <string name="unarchived">کارت از بایگانی برچیده شد</string>
+    <string name="show_validity">درستی را نشان دهید</string>
+    <string name="wrongValueForBarcodeType">مقدار برای نوع بارکد برگزیده درست نیست</string>
+    <string name="setBackImage">عکس پشتِ‌سر را بگذارید</string>
+    <string name="removeImage">عکس را برچینید</string>
+    <string name="passwordRequired">لطفا گذرواژه را وارد کنید</string>
+    <string name="previousCard">پیشین</string>
+    <string name="turn_flashlight_off">چراغ‌قوه را خاموش کنید</string>
+    <string name="settings_pink_theme">صورتی</string>
+    <string name="updateBalance">به‌روزرسانی موجودی</string>
+    <string name="barcodeLongPressMessage">تنها عکس می‌تواند در گالری برنامه باز شود</string>
+    <string name="sort_by_name">نام</string>
+    <string name="sort_by_most_recently_used">به‌تازگی استفاده‌شده</string>
+    <string name="sort_by_expiry">انقضا</string>
+    <string name="sort_by">مرتب کن با</string>
+    <string name="include_if_asking_support">اگر می‌خواهید پشتیبانی درخواست کنید، اطلاعات زیر را پر کنید:</string>
+    <string name="unarchive">برچیدن بایگانی</string>
+    <string name="switchToBackImage">به عکس پشتِ‌سر جابه‌جا کنید</string>
+    <string name="openBackImageInGalleryApp">عکس پشتِ‌سر را در برنامه‌ی گالری باز کنید</string>
+    <string name="setBarcodeHeight">ارتفاع بارگد را بگمارید</string>
+    <string name="donate">کمک مالی کنید</string>
+    <string name="icon_header_click_text">برای ویرایش قاب پیش‌نمایه فشار داده و نگه‌دارید</string>
+    <string name="show_name_below_image_thumbnail">زیر عکس پیش‌نمایه نام را نشان دهید</string>
+    <string name="show_note">یادداشت را نشان دهید</string>
+    <string name="settings_category_title_cards_overview">نگاهی به کارت‌ها</string>
+    <string name="settings_column_count_portrait">ستون‌ها در حالت پرتره</string>
+    <string name="settings_automatic_column_count">خودکار</string>
+    <string name="settings_column_count_2">۲</string>
+    <string name="settings_column_count_3">۳</string>
+    <string name="settings_column_count_4">۴</string>
+    <string name="settings_column_count_5">۵</string>
+    <string name="settings_column_count_6">۶</string>
+    <string name="failedLaunchingPhotoPicker">نتوانستم یک برنامه‌ی گالری پشتیبانی‌شده بیابم</string>
+    <string name="show_balance">موجودی را نشان دهید</string>
+    <string name="settings_column_count_landscape">ستون‌ها در حالت لنداسکیپ</string>
+    <string name="settings_column_count_1">۱</string>
+    <string name="sort_by_valid_from">درست از</string>
+    <string name="reverse">به‌ترتیب برعکس</string>
+    <string name="version_history">تاریخچه‌ی نسخه</string>
+    <string name="license">مجوز</string>
+    <string name="source_repository">مخزن منبع</string>
+    <string name="report_error">خطا را گزارش کنید</string>
+    <string name="translate_platform">در وب‌لیت</string>
+    <string name="shortcutSelectCard">یک کارت برگزینید</string>
+    <string name="options">گزینه‌ها</string>
+    <string name="starred">نشان‌شده</string>
+    <string name="on_github">روی گیتهاب</string>
+    <string name="and_data_usage">و مصرف داده</string>
+    <string name="rate_this_app">به این برنامه رتبه بدهید</string>
+    <string name="on_google_play">در گوگل‌پلی</string>
+    <string name="archive">بایگانی</string>
+    <string name="updateBalanceHint">مقدار را وارد کنید</string>
+    <string name="currentBalanceSentence">موجودی کنونی: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">موجودی تازه: <xliff:g>%s</xliff:g></string>
+    <string name="validFromDate">معتبر از</string>
+    <string name="anyDate">هر تاریخی</string>
+    <string name="validFromSentence">درست از: <xliff:g>%s</xliff:g></string>
+    <string name="switchToFrontImage">به عکس روبه‌رو جابه‌جا کنید</string>
+    <string name="nextCard">پسین</string>
+    <string name="failedToOpenUrl">نخست یک مرورگر وب نصب کنید</string>
+    <string name="updateBalanceTitle">چقدر خرج یا دریافت کردید؟</string>
+    <string name="switchToBarcode">به بارکد جابه‌جا کنید</string>
+    <string name="openFrontImageInGalleryApp">عکس روبه‌رو را در برنامه‌ی گالری باز کنید</string>
+    <string name="add_a_card_in_a_different_way">یک کارت به روشی متفاوت بیافزایید</string>
+    <string name="takePhoto">عکس بگیرید</string>
+    <string name="settings_column_count_7">۷</string>
+    <string name="manually_enter_barcode_instructions">شماره شناسایی یا متنی که روی کارت شماست را وارد کنید و بارکدی را که شبیه بارکد روی کارت شماست فشار دهید.</string>
+    <string name="failedLaunchingFileManager">نتوانستم یک مدیر فایل پشتیبانی‌شده پیدا کنم</string>
+    <string name="useFrontImage">از تصویر جلو استفاده کنید</string>
+    <string name="useBackImage">از تصویر پشت استفاده کنید</string>
+    <string name="pageWithNumber">صفحه <xliff:g>%d</xliff:g></string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">از کدام یک از بارکدهای پیدا شده می‌خواهید استفاده کنید؟</string>
+    <string name="width">عرض</string>
+    <string name="setBarcodeWidth">تنظیم عرض بارکد</string>
+    <string name="unsupportedFile">این فایل پشتیبانی نمی‌شود</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> کارت (<xliff:g id="archivedCount">%2$d</xliff:g> بایگانی شده)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> کارت‌ (<xliff:g id="archivedCount">%2$d</xliff:g> بایگانی شده‌)</item>
+    </plurals>
+    <string name="spend">خرج کردن</string>
+    <string name="addFromPkpass">یک فایل دفترچه حساب (.pkpass) انتخاب کنید</string>
+    <string name="noCameraFoundGuideText">به نظر نمی‌رسد دستگاه شما دوربین داشته باشد. اگر دارد، دستگاه را مجدداً راه‌اندازی کنید. در غیر این صورت، از دکمه گزینه‌های بیشتر در زیر برای افزودن بارکد به روش دیگری استفاده کنید.</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -306,4 +306,8 @@
     <string name="unsupportedFile">Tämä tiedosto ei ole tuettu</string>
     <string name="generic_error_please_retry">Pahoittelut, jokin meni pieleen. Yritä uudelleen...</string>
     <string name="sort_by_valid_from">Voimassa alkaen</string>
+    <string name="width">Leveys</string>
+    <string name="setBarcodeWidth">Aseta viivakoodin leveys</string>
+    <string name="card_list_widget_name">Korttiluettelo</string>
+    <string name="card_list_widget_empty">Kun olet lisännyt kanta-asiakaskortteja Catimaan, ne näkyvät täällä. Jos sinulla on kortteja, varmista, etteivät ne kaikki ole arkistoituja.</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -314,4 +314,6 @@
     <string name="sort_by_valid_from">Valide à partir du</string>
     <string name="width">Largeur</string>
     <string name="setBarcodeWidth">Définir la largeur du code-barres</string>
+    <string name="card_list_widget_name">Liste des cartes</string>
+    <string name="card_list_widget_empty">Après avoir ajouter des cartes de fidélité dans Catima, elles apparaîtront ici. Si vous avez des cartes, assurez-vous qu\'elles ne soient pas archivées.</string>
 </resources>

app/src/main/res/values-gl/strings.xml

@@ -302,4 +302,6 @@
     <string name="sort_by_valid_from">Válido desde</string>
     <string name="width">Anchura</string>
     <string name="setBarcodeWidth">Establecer anchura do código de barras</string>
+    <string name="card_list_widget_name">Lista de tarxetas</string>
+    <string name="card_list_widget_empty">Aquí aparecerán as tarxetas fidelidade cando as engadas a Catima. Se tes tarxetas mira que non estean arquivadas.</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -302,4 +302,6 @@
     <string name="settings_column_count_landscape">क्षैतिज मोड में कॉलम</string>
     <string name="settings_column_count_1">1</string>
     <string name="settings_column_count_7">7</string>
+    <string name="card_list_widget_name">कार्ड सूची</string>
+    <string name="card_list_widget_empty">कैटिमा में कुछ लॉयल्टी कार्ड जोड़ने के बाद, वे यहाँ दिखाई देंगे। अगर आपके पास कार्ड हैं, तो सुनिश्चित करें कि वे सभी संग्रहित न हों।</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -306,4 +306,6 @@
     <string name="settings_column_count_4">4</string>
     <string name="settings_column_count_7">7</string>
     <string name="sort_by_valid_from">Érvényesség kezdete</string>
+    <string name="width">Szélesség</string>
+    <string name="setBarcodeWidth">Vonalkód szélességének beállítása</string>
 </resources>

app/src/main/res/values-in-rID/strings.xml

@@ -300,4 +300,8 @@
     <string name="unsupportedFile">File ini tidak didukung</string>
     <string name="generic_error_please_retry">Maaf, terjadi kesalahan, silakan coba lagi...</string>
     <string name="sort_by_valid_from">Berlaku dari</string>
+    <string name="width">Lebar</string>
+    <string name="card_list_widget_name">Daftar kartu</string>
+    <string name="setBarcodeWidth">Atur Lebar Barcode</string>
+    <string name="card_list_widget_empty">Setelah Anda menambahkan beberapa kartu loyalitas di Catima, kartu tersebut akan muncul di sini. Jika Anda memiliki kartu sebelumnya, pastikan tidak semuanya diarsipkan.</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -314,4 +314,6 @@
     <string name="sort_by_valid_from">Valido da</string>
     <string name="setBarcodeWidth">Imposta la larghezza del codice a barre</string>
     <string name="width">Larghezza</string>
+    <string name="card_list_widget_name">Lista delle carte</string>
+    <string name="card_list_widget_empty">Dopo aver aggiunto alcune carte fedeltà in Catima, queste appariranno qui. Se hai delle carte, assicurati che non siano tutte archiviate.</string>
 </resources>

app/src/main/res/values-iw/strings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="action_search">חיפוש</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> נבחר</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> נבחרו</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> נבחרו</item>
+    </plurals>
+    <string name="action_add">הוסף</string>
+    <string name="noGiftCards">לחץ על כפתור הפלוס (+) כדי להוסיף כרטיס, או ייבא מתפריט ⋮.</string>
+</resources>

app/src/main/res/values-ja/strings.xml

@@ -51,7 +51,7 @@
     <string name="intent_import_card_from_url_share_text">カード共有をしましょう</string>
     <string name="settings_disable_lockscreen_while_viewing_card">バーコード表示中に画面をロックしない</string>
     <string name="settings_keep_screen_on">バーコード表示中に画面を点けたままにする</string>
-    <string name="settings_display_barcode_max_brightness">バーコード表示画面を明るくする</string>
+    <string name="settings_display_barcode_max_brightness">画面を明るくする</string>
     <string name="settings_dark_theme">ダーク</string>
     <string name="settings_light_theme">ライト</string>
     <string name="settings_system_theme">システムに従う</string>
@@ -189,7 +189,7 @@
     <string name="chooseValidFromDate">有効期限を選択</string>
     <string name="anyDate">無期限</string>
     <string name="app_name">Catima</string>
-    <string name="settings_card_orientation">バーコードの向き</string>
+    <string name="settings_card_orientation">画面の向き</string>
     <string name="settings_display_barcode_max_brightness_summary">仕事をするためにいくつかのスキャナーが必要</string>
     <string name="settings_follow_system_orientation">システムに従う</string>
     <string name="storageReadPermissionRequired">このアクションのためにストレージの読み取り権限を許可…</string>
@@ -239,4 +239,8 @@
     <string name="settings_column_count_4">4</string>
     <string name="settings_category_title_privacy">プライバシー</string>
     <string name="exportCancelled">輸出がキャンセルされた</string>
+    <string name="settings_allow_content_provider_read_title">他のアプリが自分のデータにアクセスすることを許可する</string>
+    <string name="permissionReadCardsDescription">Catimaカードと、ノートや画像を含むすべての詳細を読み取る</string>
+    <string name="settings_use_volume_keys_navigation_summary">ボリュームボタンを使ってどのカードを表示するかを変更する</string>
+    <string name="unsupportedFile">このファイルはサポートされていません</string>
 </resources>

app/src/main/res/values-kn/strings.xml

@@ -48,4 +48,29 @@
     <string name="amountParsingFailed">ಅಮಾನ್ಯ ಮೊತ್ತ</string>
     <string name="accept">ಸ್ವೀಕರಿಸಿ</string>
     <string name="confirm">ದೃಢೀಕರಿಸಿ</string>
-</resources>
+    <string name="app_name">ಕ್ಯಾಟಿಮಾ</string>
+    <string name="save">ಉಳಿಸಿ</string>
+    <string name="edit">ಸಂಪಾದಿಸಿ</string>
+    <string name="deleteTitle">ಕಾರ್ಡನ್ನು ಅಳಿಸಿ</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"><xliff:g>%d</xliff:g> \u0020ಕಾರ್ಡನ್ನು ಅಳಿಸಿ</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> \u0020ಕಾರ್ಡುಗಳನ್ನು ಅಳಿಸಿ</item>
+    </plurals>
+    <string name="deleteConfirmation">ಈ ಕಾರ್ಡ್ ಅನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುವುದೇ?</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one"><xliff:g>%d</xliff:g> ಈ ಕಾರ್ಡ್ ಅನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುವುದೇ?</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> ಈ ಕಾರ್ಡ್ಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುವುದೇ?</item>
+    </plurals>
+    <string name="ok">ಸರಿ</string>
+    <string name="editCardTitle">ಕಾರ್ಡನ್ನು ಸಂಪಾದಿಸಿ</string>
+    <string name="scanCardBarcode">ಬಾರ್ ಕೋಡನ್ನು ಸ್ಕಾನ್ ಮಾಡಿ</string>
+    <string name="noCardsMessage">ಮೊದಲು ಒಂದು ಕಾರ್ಡನ್ನು ಸೇರಿಸಿ</string>
+    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> ಬಾರ್ಕೋಡ್ ನ ಚಿತ್ರವಾಗಿದೆ</string>
+    <string name="noCardExistsError">ಆ ಕಾರ್ಡನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ</string>
+    <string name="failedParsingImportUriError">ಆಮದು ಆದ URI ಅನ್ನು ವಿಶ್ಲೇಷಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
+    <string name="importExport">ಬೇರೆಡೆಯಿಂದ ತೆಗೆದುಕೊ / ಬೇರೆಡೆಗೆ ವರ್ಗಾಯಿಸು</string>
+    <string name="exportName">ಬೇರೆಡೆಗೆ ಸಾಗಿಸು</string>
+    <string name="importExportHelp">ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡುವುದರಿಂದ ಅದನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ಸಾಗಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+    <string name="importSuccessfulTitle">ಬೇರೆಡೆಯಿಂದ ತಂದಿರುವ</string>
+    <string name="importFailedTitle">ತೆಗೆದುಕೊಂಡು ಬರಲು ವಿಫಲ</string>
+</resources>

app/src/main/res/values-ko/strings.xml

@@ -300,4 +300,6 @@
     <string name="settings_automatic_column_count">자동</string>
     <string name="settings_column_count_1">1</string>
     <string name="sort_by_valid_from">유효 기간</string>
+    <string name="width">너비</string>
+    <string name="setBarcodeWidth">바코드 너비를 설정하세요</string>
 </resources>

app/src/main/res/values-lv/strings.xml

@@ -309,4 +309,6 @@
     <string name="sort_by_valid_from">Derīga no</string>
     <string name="setBarcodeWidth">Iestatīt svītrkoda platumu</string>
     <string name="width">Platums</string>
+    <string name="card_list_widget_name">Karšu saraksts</string>
+    <string name="card_list_widget_empty">Pēc klienta karšu pievienošanas Catima tās parādīsies šeit. Ja Tev ir kartes, jāpārliecinās, ka tās visas nav arhivētas.</string>
 </resources>

app/src/main/res/values-ml/strings.xml

@@ -42,4 +42,14 @@
     </plurals>
     <string name="action_add">ചേർക്കുക</string>
     <string name="deleteTitle">കാർഡ് ഇല്ലാതാക്കുക</string>
-</resources>
+    <string name="app_name">കേറ്റിമ</string>
+    <string name="note">നോട്ട്</string>
+    <string name="cardShortcut">കാർഡ് ഷോർട്ക്കറ്</string>
+    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> ബാർകോഡ്</string>
+    <string name="failedParsingImportUriError">നൽകിയ URL വ്യാകരിക്കാൻ കഴിഞ്ഞില്ല</string>
+    <string name="storageReadPermissionRequired">ഈ പ്രവർത്തനത്തിന് ആവശ്യമായ സ്റ്റോറേജ് വായിക്കാനുള്ള അനുമതി വേണം…</string>
+    <string name="cameraPermissionRequired">ഈ പ്രവർത്തനത്തിന് ക്യാമറ ആക്സസ് ചെയ്യുന്നതിന് അനുമതി വേണം.…</string>
+    <string name="permissionReadCardsLabel">കേറ്റിമ കാർഡ് വായിക്കുക</string>
+    <string name="cameraPermissionDeniedTitle">ക്യാമറയ്ക്കായി അനുമതി നേടാനായില്ല</string>
+    <string name="exportOptionExplanation">നിങ്ങൾ ഇഷ്ടപ്പെടുന്ന സ്ഥലത്ത് ഡാറ്റ എഴുതപ്പെടും.</string>
+</resources>

app/src/main/res/values-mr/strings.xml

@@ -84,6 +84,14 @@
     <string name="settings_theme">थीम</string>
     <string name="settings_light_theme">उजळ</string>
     <string name="settings">सेटिंग्ज</string>
-    <string name="settings_card_orientation">बार्कोड अभिमुखता</string>
+    <string name="settings_card_orientation">स्क्रीन ओरिएंटेशन</string>
     <string name="thumbnailDescription">लघुप्रतिमा</string>
-</resources>
+    <string name="settings_keep_screen_on_summary">कार्ड पाहताना स्क्रीन टाइमआउट बंद करते</string>
+    <string name="settings_follow_sensor_orientation">नेहमी फिरवा (सिस्टम सेटिंग्ज दुर्लक्षित करेल)</string>
+    <string name="settings_lock_on_opening_orientation">कार्ड उघडताना वापरला जाणारा लॉक टू ओरिएंटेशन</string>
+    <string name="settings_display_barcode_max_brightness">स्क्रीन उजळवा</string>
+    <string name="settings_display_barcode_max_brightness_summary">काही स्कॅनर्सना काम करण्यासाठी आवश्यक</string>
+    <string name="settings_keep_screen_on">स्क्रीन चालू ठेवा</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">स्क्रीन लॉक प्रतिबंधित करा</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">कार्ड पाहताना स्क्रीन लॉक बंद करते</string>
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -306,4 +306,8 @@
     <string name="unsupportedFile">Dit bestand wordt niet ondersteund</string>
     <string name="generic_error_please_retry">Sorry, er ging iets mis. Probeer het opnieuw.</string>
     <string name="sort_by_valid_from">Op geldig vanaf</string>
+    <string name="width">Breedte</string>
+    <string name="setBarcodeWidth">Stel Barcodebreedte in</string>
+    <string name="card_list_widget_name">Kaartenlijst</string>
+    <string name="card_list_widget_empty">Zodra er kaarten in Catima toegevoegd zijn worden deze hier getoond. Heb je al kaarten? Controleer dan of deze niet gearchiveerd zijn.</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -187,7 +187,7 @@
     <string name="rate_this_app">Oceń tę aplikację</string>
     <string name="license">Licencja</string>
     <string name="on_google_play">w Google Play</string>
-    <string name="noGiftCardsGroup">Stwórz karty i przypisz je do grup w tym miejscu.</string>
+    <string name="noGiftCardsGroup">Utwórz karty i przypisz je do grup w tym miejscu.</string>
     <string name="reverse">...w odwrotnej kolejności</string>
     <string name="translate_platform">na Weblate</string>
     <string name="sort">Sortuj</string>
@@ -320,4 +320,6 @@
     <string name="sort_by_valid_from">Poprawna forma</string>
     <string name="setBarcodeWidth">Ustaw szerokość kodu kreskowego</string>
     <string name="width">Szerokość</string>
+    <string name="card_list_widget_empty">Karty lojalnościowe dodane w aplikacji Catima pokażą się tutaj. Jeżeli masz jakieś karty, upewnij się że nie są one zarchiwizowane.</string>
+    <string name="card_list_widget_name">Lista kart</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -314,4 +314,6 @@
     <string name="sort_by_valid_from">Válido a partir de</string>
     <string name="width">Largura</string>
     <string name="setBarcodeWidth">Definir largura do código de barras</string>
+    <string name="card_list_widget_name">Lista de cartões</string>
+    <string name="card_list_widget_empty">Depois que você adicionar alguns cartões de fidelidade no Catima, eles aparecerão aqui. Se você tiver cartões, verifique se eles não estão todos arquivados.</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -314,4 +314,6 @@
     <string name="sort_by_valid_from">Válido a partir de</string>
     <string name="width">Largura</string>
     <string name="setBarcodeWidth">Definir a largura do código de barras</string>
+    <string name="card_list_widget_name">Lista de cartões</string>
+    <string name="card_list_widget_empty">Após adicionar cartões de fidelidade em Catima, eles aparecerão aqui. Se tem cartões, certifique-se de que não estão todos arquivados.</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -308,4 +308,6 @@
     <string name="generic_error_please_retry">Lamento, ocorreu um erro, tente novamente...</string>
     <string name="setBarcodeWidth">Definir Largura do Código de Barra</string>
     <string name="width">Largura</string>
+    <string name="card_list_widget_name">Lista de cartões</string>
+    <string name="card_list_widget_empty">Após adicionar cartões de fidelidade em Catima, eles aparecerão aqui. Se tem cartões, certifique-se de que não estão todos arquivados.</string>
 </resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -307,4 +307,6 @@
     <string name="addFromPkpass">Selectează un fișier de tip Passbook (.pkpass)</string>
     <string name="unsupportedFile">Acest fișier nu este suportat</string>
     <string name="generic_error_please_retry">Scuze, ceva nu a funționat. Încearcă din nou ...</string>
+    <string name="width">Lățime</string>
+    <string name="setBarcodeWidth">Setează Lățimea Codului de Bare</string>
 </resources>