Release Catima 2.37.0

Merge pull request #2630 from CatimaLoyalty/create-pull-request/patch-1755877734
Update feature graphic
2025-12-24 15:47:53 -05:00 · 2025-08-22 18:18:42 +02:00 · 2025-08-22 18:15:19 +02:00 · 2025-08-22 15:48:53 +00:00 · 2025-08-22 17:46:35 +02:00 · 2025-08-22 17:38:09 +02:00
1003 changed files with 10920 additions and 3420 deletions
--- a/.design/README.txt
+++ b/.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
--- a/.design/ic_launcher_background.svg
+++ b/.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>
--- a/.design/ic_launcher_foreground.svg
+++ b/.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>
--- a/.design/ic_launcher_monochrome.svg
+++ b/.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>
--- a/.design/master_color.svg
+++ b/.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>
--- a/.design/master_monochrome.svg
+++ b/.design/master_monochrome.svg
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -24,31 +24,49 @@ 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
+    strategy:
+      matrix:
+        flavor: [Foss, Gplay]
    steps:
-    - uses: actions/checkout@v4.1.7
-    - name: Fail on bad translations
-      run: if grep -ri "&lt;xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
-    - uses: gradle/actions/wrapper-validation@v3
-    - name: set up OpenJDK 17
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y openjdk-17-jdk-headless
-        sudo update-alternatives --auto java
-    - name: Build
-      run: ./gradlew assembleRelease
-    - name: Check lint
-      run: ./gradlew lintRelease
-    - name: Run unit tests
-      run: timeout 5m ./gradlew testReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew testReleaseUnitTest; }
-    - name: SpotBugs
-      run: ./gradlew spotbugsRelease
-    - name: Archive test results
-      if: always()
-      uses: actions/upload-artifact@v4.3.4
-      with:
-        name: test-results
-        path: app/build/reports
+      - uses: actions/checkout@v5.0.0
+      - name: Fail on bad translations
+        run: if grep -ri "&lt;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 21
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y openjdk-21-jdk-headless
+          sudo update-alternatives --auto java
+      - name: Build
+        run: ./gradlew assemble${{ matrix.flavor }}Release
+      - name: Check lint
+        run: ./gradlew lint${{ matrix.flavor }}Release
+      - name: Run unit tests
+        run: timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest; }
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+      - name: Run instrumented tests (API 21)
+        uses: ReactiveCircus/android-emulator-runner@v2
+        with:
+          api-level: 21
+          arch: x86_64
+          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
+      - name: Run instrumented tests (API 35)
+        uses: ReactiveCircus/android-emulator-runner@v2
+        with:
+          api-level: 35
+          arch: x86_64
+          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
+      - name: Archive test results
+        if: always()
+        uses: actions/upload-artifact@v4.6.2
+        with:
+          name: test-results-flavor${{ matrix.flavor }}
+          path: app/build/reports
--- a/.github/workflows/changelog-to-fastlane.yml
+++ b/.github/workflows/changelog-to-fastlane.yml
@@ -27,15 +27,15 @@ jobs:
    steps:
    - name: Checkout repo
      id: checkout
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v5.0.0
    - name: Setup Python
-      uses: actions/setup-python@v5.1.1
+      uses: actions/setup-python@v5.6.0
      with:
        python-version: '3.x'
    - name: Run converter script
      run: python .scripts/changelog_to_fastlane.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.1.0
+      uses: peter-evans/create-pull-request@v7.0.8
      with:
        title: "Update Fastlane changelogs"
        commit-message: "Update Fastlane changelogs"
--- a/.github/workflows/contributors-to-file.yml
+++ b/.github/workflows/contributors-to-file.yml
@@ -25,7 +25,7 @@ jobs:
    steps:
    - name: Checkout repo
      id: checkout
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v5.0.0
    - name: Update contributors
      id: update_contributors
      uses: TheLastProject/contributors-to-file-action@v3.2.0
@@ -33,7 +33,7 @@ jobs:
        file_in_repo: app/src/main/res/raw/contributors.txt
        min_commit_count: 5
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.1.0
+      uses: peter-evans/create-pull-request@v7.0.8
      with:
        title: "Update contributors"
        commit-message: "Update contributors"
--- a/.github/workflows/generate-feature-graphic.yml
+++ b/.github/workflows/generate-feature-graphic.yml
@@ -25,11 +25,11 @@ jobs:
  generate-feature-graphic:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5.0.0
    - name: Install requirements
      run: |
        sudo apt-get update
-        sudo apt-get install optipng mat2
+        sudo apt-get install inkscape mat2 optipng xvfb
        # Install 200 weight versions of relevant Noto (to use for languages not supported by Lexend Deca)
        sudo apt-get install fonts-noto-extra fonts-noto-cjk-extra
        # Custom fonts
@@ -39,7 +39,7 @@ jobs:
    - name: Generate featureGraphic.png for each language
      run: .scripts/generate_feature_graphic/generate_feature_graphic.sh
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.1.0
+      uses: peter-evans/create-pull-request@v7.0.8
      with:
        title: "Update feature graphic"
        commit-message: "Update feature graphic"
--- a/.github/workflows/gradle-update.yml
+++ b/.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.1.7
-    - uses: obfusk/gradle-update-action@v2.0.0
-      id: gradle-update
-    - uses: gradle/actions/wrapper-validation@v3
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.1.0
-      with:
-        title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
-        commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
-        branch-suffix: timestamp
--- a/.github/workflows/update-locales.yml
+++ b/.github/workflows/update-locales.yml
@@ -25,13 +25,13 @@ jobs:
  update-locales:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5.0.0
    - name: Add new locales
      run: .scripts/new-locales.py
    - name: Update locales
      run: .scripts/locales.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v6.1.0
+      uses: peter-evans/create-pull-request@v7.0.8
      with:
        title: "Update locales"
        commit-message: "Update locales"
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@
 /.bundle/
 /vendor/bundle
 /lib/bundler/man/
+
+# Catima-specific
+SHA256SUMS
--- a/.scripts/generate_feature_graphic/featureGraphic.svg
+++ b/.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 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 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>
--- a/.scripts/generate_feature_graphic/fonts/Lexend/Lexend-Regular.ttf
+++ b/.scripts/generate_feature_graphic/fonts/Lexend/Lexend-Regular.ttf
--- a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt
+++ b/.scripts/generate_feature_graphic/fonts/Lexend_Deca/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


 -----------------------------------------------------------
--- a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/LexendDeca-ExtraLight.ttf
+++ b/.scripts/generate_feature_graphic/fonts/Lexend_Deca/LexendDeca-ExtraLight.ttf
--- a/.scripts/generate_feature_graphic/fonts/Lobster/Lobster-Regular.ttf
+++ b/.scripts/generate_feature_graphic/fonts/Lobster/Lobster-Regular.ttf
--- a/.scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt
+++ b/.scripts/generate_feature_graphic/fonts/Yesteryear/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


 -----------------------------------------------------------
--- a/.scripts/generate_feature_graphic/fonts/Yesteryear/Yesteryear-Regular.ttf
+++ b/.scripts/generate_feature_graphic/fonts/Yesteryear/Yesteryear-Regular.ttf
--- a/.scripts/generate_feature_graphic/generate_feature_graphic.sh
+++ b/.scripts/generate_feature_graphic/generate_feature_graphic.sh
@@ -4,6 +4,11 @@ set -euo pipefail
 script_location="$(dirname "$(readlink -f "$0")")"

 for lang in "$script_location/../../fastlane/metadata/android/"*; do
+  # Skip languages without title.txt
+  if [ ! -f "$lang/title.txt" ]; then
+    continue
+  fi
+
  pushd "$lang"
  # Place temporary copy for editing if needed
  cp "$script_location/featureGraphic.svg" featureGraphic.svg
@@ -28,23 +33,25 @@ 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 ;;
-      hi-IN) sed -i -e "s/Yesteryear/Noto Serif 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 "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
-  convert featureGraphic.svg images/featureGraphic.png
+  # Generate .png (we use Inkscape because ImageMagick ignores RTL)
+  xvfb-run inkscape --export-filename=images/featureGraphic.png featureGraphic.svg
  # Optimize .png
  optipng images/featureGraphic.png
  # Remove metadata (timestamps) from .png
--- a/.scripts/new-locales.py
+++ b/.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",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,78 @@
 # Changelog

+## 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
+- Various scanning fixes
+- Fix crash when loading a pkpass file without barcode
+
+## v2.34.5 - 147 (2025-03-22)
+
+- Target Android 15
+- Fix crash reading unsupported pkpass files
+- Improve pkpass support
+
+## v2.34.4 - 146 (2025-01-17)
+
+- Ability to sort cards by start of validity
+- Temporarily revert to targeting Android 14 to fix some UI issues
+
+## v2.34.3 - 145 (2025-01-15)
+
+- Target Android 15
+- Fix keyboard covering save button in edit screen
+- Fix some pkpass files not being detected as pkpass (application/vnd-com.apple.pkpass mime type support)
+
+## v2.34.2 - 144 (2024-12-26)
+
+- Improve archive/starred icon display
+
+## v2.34.1 - 143 (2024-12-12)
+
+- Fix crash when opening invalid pkpass files
+
+## v2.34.0 - 142 (2024-12-10)
+
+- Add Passbook (.pkpass) support
+- Fix import of transparent PDF files
+- Improve display of transparent thumbnails
+
+## v2.33.0 - 141 (2024-11-19)
+
+- Change default column on wide screens to 4
+- Allow overriding column counts for portrait and landscape in settings
+- Keep main screen search filter when rotating screen or opening a card
+- Limit max length of note display on main screen
+
+## v2.32.1 - 140 (2024-10-29)
+
+- Fix text wrapping on add dialog
+
+## v2.32.0 - 139 (2024-10-28)
+
+- Option to navigate cards using the volume buttons
+- Fix Stocard import
+- Fix "Import cancelled" message appearing after successful import
+
+## v2.31.1 - 138 (2024-08-24)
+
+- Fix back gesture on main screen dismissing keyboard and search on Android 13+
+
 ## v2.31.0 - 137 (2024-07-26)

 - Allow long store names in preview to split over multiple lines
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+catima.g9ex3@hackerchick.me.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
--- a/CONTRIBUTING.md
+++ b/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.

--- a/5
+++ b/5
@@ -1,3 +1,8 @@
 source "https://rubygems.org"

 gem "fastlane"
+
+# https://github.com/fastlane/fastlane/issues/29183
+gem "abbrev"
+gem "mutex_m"
+gem "ostruct"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,41 +5,44 @@ GEM
      base64
      nkf
      rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    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.0)
-    aws-partitions (1.945.0)
-    aws-sdk-core (3.197.1)
+    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.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.85.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+      logger
+    aws-sdk-kms (1.105.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.189.1)
+      aws-sdk-core (~> 3, >= 3.225.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    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)
    commander (4.6.0)
      highline (~> 2.0.0)
    declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.6.20240107)
    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.110.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -55,20 +58,20 @@ 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.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
      faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.221.1)
+    fastimage (2.4.0)
+    fastlane (2.228.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -84,6 +87,7 @@ GEM
      faraday-cookie_jar (~> 0.0.6)
      faraday_middleware (~> 1.0)
      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-apis-androidpublisher_v3 (~> 0.3)
      google-apis-playcustomapp_v1 (~> 0.1)
@@ -107,8 +111,10 @@ GEM
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.1)
      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
    gh_inspector (1.1.3)
    google-apis-androidpublisher_v3 (0.54.0)
      google-apis-core (>= 0.11.0, < 2.a)
@@ -126,12 +132,12 @@ GEM
      google-apis-core (>= 0.11.0, < 2.a)
    google-apis-storage_v1 (0.31.0)
      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.0)
+    google-cloud-core (1.8.0)
      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
    google-cloud-storage (1.47.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
@@ -147,37 +153,40 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.8)
      domain_name (~> 0.5)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
    jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.8.2)
+    json (2.12.2)
+    jwt (2.10.1)
      base64
-    mini_magick (4.13.1)
+    logger (1.7.0)
+    mini_magick (4.13.2)
    mini_mime (1.1.5)
    multi_json (1.15.0)
    multipart-post (2.4.1)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
    nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
    os (1.1.4)
-    plist (3.7.1)
-    public_suffix (5.1.1)
-    rake (13.2.1)
+    ostruct (0.6.1)
+    plist (3.7.2)
+    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)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.9)
-      strscan
-    rouge (2.0.7)
+    rexml (3.4.1)
+    rouge (3.28.0)
    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    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)
@@ -185,7 +194,7 @@ GEM
    simctl (1.6.10)
      CFPropertyList
      naturally
-    strscan (3.1.0)
+    sysrandom (1.0.5)
    terminal-notifier (2.0.0)
    terminal-table (3.0.2)
      unicode-display_width (>= 1.1.1, < 3)
@@ -195,17 +204,17 @@ GEM
    tty-spinner (0.9.3)
      tty-cursor (~> 0.7)
    uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
    word_wrap (1.0.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.27.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
    xcpretty-travis-formatter (1.0.1)
      xcpretty (~> 0.2, >= 0.0.7)

@@ -213,7 +222,10 @@ PLATFORMS
  ruby

 DEPENDENCIES
+  abbrev
  fastlane
+  mutex_m
+  ostruct

 BUNDLED WITH
-   2.5.9
+   2.5.22
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,33 +1,34 @@
 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 {
    namespace = "protect.card_locker"
-    compileSdk = 34
+    compileSdk = 35

    defaultConfig {
        applicationId = "me.hackerchick.catima"
        minSdk = 21
-        targetSdk = 34
-        versionCode = 137
-        versionName = "2.31.0"
+        targetSdk = 35
+        versionCode = 151
+        versionName = "2.37.0"

        vectorDrawables.useSupportLibrary = true
        multiDexEnabled = true

-        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "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"
+
+        buildConfigField("boolean", "showDonate", "true")
+        buildConfigField("boolean", "showRateOnGooglePlay", "false")
    }

    buildTypes {
@@ -48,6 +49,21 @@ android {
        viewBinding = true
    }

+    flavorDimensions.add("type")
+    productFlavors {
+        create("foss") {
+            dimension = "type"
+            isDefault = true
+        }
+        create("gplay") {
+            dimension = "type"
+
+            // Google doesn't allow donation links
+            buildConfigField("boolean", "showDonate", "false")
+            buildConfigField("boolean", "showRateOnGooglePlay", "true")
+        }
+    }
+
    bundle {
        language {
            enableSplit = false
@@ -60,8 +76,8 @@ android {
        // Flag to enable support for the new language APIs
        isCoreLibraryDesugaringEnabled = true

-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
    }

    sourceSets {
@@ -82,49 +98,49 @@ android {
    lint {
        lintConfig = file("lint.xml")
    }
+    kotlinOptions {
+        jvmTarget = "21"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
 }

 dependencies {
-
    // AndroidX
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.exifinterface:exifinterface:1.3.7")
+    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")
    implementation("androidx.preference:preference:1.2.1")
    implementation("com.google.android.material:material:1.12.0")
-    implementation("com.github.yalantis:ucrop:2.2.9")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
-
-    // Splash Screen
-    implementation("androidx.core:core-splashscreen:1.0.1")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")

    // Third-party
    implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
+    implementation("com.github.yalantis:ucrop:2.2.10")
    implementation("com.google.zxing:core:3.5.3")
    implementation("org.apache.commons:commons-csv:1.9.0")
    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
-    testImplementation("androidx.test:core:1.6.1")
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.robolectric:robolectric:4.13")
-}
+    val androidXTestVersion = "1.7.0"
+    val junitVersion = "4.13.2"
+    testImplementation("androidx.test:core:$androidXTestVersion")
+    testImplementation("junit:junit:$junitVersion")
+    testImplementation("org.robolectric:robolectric:4.15.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:core:$androidXTestVersion")
+    androidTestImplementation("junit:junit:$junitVersion")
+    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.7.0")
 }

 tasks.register("copyRawResFiles", Copy::class) {
--- a/app/src/androidTest/java/protect/card_locker/MainActivitySearchViewTest.java
+++ b/app/src/androidTest/java/protect/card_locker/MainActivitySearchViewTest.java
@@ -0,0 +1,67 @@
+package protect.card_locker;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.typeText;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withChild;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+
+import androidx.appcompat.widget.Toolbar;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MainActivitySearchViewTest {
+
+    @Test
+    public void whenSearchViewIsExpandedAndBackIsPressedThenMenuItemShouldNotBeCollapsed() {
+        String query = "random arbitrary text";
+        try (ActivityScenario<MainActivity> mainActivityScenario = ActivityScenario.launch(MainActivity.class)) {
+            mainActivityScenario.onActivity(this::makeSearchMenuItemVisible);
+            onView(withId(R.id.action_search)).perform(click());
+            onView(withId(androidx.appcompat.R.id.search_src_text)).perform(typeText(query));
+
+            pressBack();
+
+            onView(withId(androidx.appcompat.R.id.search_src_text)).check(matches(withText(query)));
+            mainActivityScenario.onActivity(activity -> assertEquals(query, activity.mFilter));
+        }
+    }
+
+    @Test
+    public void whenSearchViewIsExpandedThenItShouldOnlyBeCollapsedWhenBackIsPressedTwice() {
+        try (ActivityScenario<MainActivity> mainActivityScenario = ActivityScenario.launch(MainActivity.class)) {
+            mainActivityScenario.onActivity(this::makeSearchMenuItemVisible);
+            onView(withId(R.id.action_search)).perform(click());
+
+            pressBack();
+
+            onView(withId(androidx.appcompat.R.id.search_src_text)).check(matches(isDisplayed()));
+
+            pressBack();
+
+            onView(withId(android.R.id.content)).check(matches(is(not(withChild(withId(androidx.appcompat.R.id.search_src_text))))));
+        }
+    }
+
+    private void makeSearchMenuItemVisible(MainActivity activity) {
+        Toolbar toolbar = activity.findViewById(R.id.toolbar);
+        toolbar.getMenu().findItem(R.id.action_search).setVisible(true);
+    }
+
+    private void pressBack() {
+        UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).pressBack();
+    }
+
+}
--- a/app/src/debug/res/values-ast/strings.xml
+++ b/app/src/debug/res/values-ast/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Fehlersuche</string>
+</resources>
--- a/app/src/debug/res/values-bg/strings.xml
+++ b/app/src/debug/res/values-bg/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Отстраняване на грешки в Catima</string>
+</resources>
--- a/app/src/debug/res/values-bn-rIN/strings.xml
+++ b/app/src/debug/res/values-bn-rIN/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">ক্যাটিমা ডিবাগ</string>
+</resources>
--- a/app/src/debug/res/values-bn/strings.xml
+++ b/app/src/debug/res/values-bn/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">ক্যাটিমা ডিবাগ</string>
+</resources>
--- a/app/src/debug/res/values-bs/strings.xml
+++ b/app/src/debug/res/values-bs/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Otklanjanje Grešaka</string>
+</resources>
--- a/app/src/debug/res/values-ca/strings.xml
+++ b/app/src/debug/res/values-ca/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Debugar Catima</string>
+</resources>
--- a/app/src/debug/res/values-cs/strings.xml
+++ b/app/src/debug/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Catima Debug</string>
-</resources>
+    <string name="app_name">Catima Ladění</string>
+</resources>
--- a/app/src/debug/res/values-cy/strings.xml
+++ b/app/src/debug/res/values-cy/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Datfygio</string>
+</resources>
--- a/app/src/debug/res/values-da/strings.xml
+++ b/app/src/debug/res/values-da/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Fejlfinding</string>
+</resources>
--- a/app/src/debug/res/values-eo/strings.xml
+++ b/app/src/debug/res/values-eo/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>
--- a/app/src/debug/res/values-es-rAR/strings.xml
+++ b/app/src/debug/res/values-es-rAR/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Depuración</string>
+</resources>
--- a/app/src/debug/res/values-et/strings.xml
+++ b/app/src/debug/res/values-et/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>
--- a/app/src/debug/res/values-fa/strings.xml
+++ b/app/src/debug/res/values-fa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">عیب‌یابی کاتیما</string>
+</resources>
--- a/app/src/debug/res/values-fi/strings.xml
+++ b/app/src/debug/res/values-fi/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima-vianmääritys</string>
+</resources>
--- a/app/src/debug/res/values-fr/strings.xml
+++ b/app/src/debug/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Débogage de Catima</string>
-</resources>
+</resources>
--- a/app/src/debug/res/values-gl/strings.xml
+++ b/app/src/debug/res/values-gl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Depuración de Catima</string>
+</resources>
--- a/app/src/debug/res/values-he-rIL/strings.xml
+++ b/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>
--- a/app/src/debug/res/values-is/strings.xml
+++ b/app/src/debug/res/values-is/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Villuleit</string>
+</resources>
--- a/app/src/debug/res/values-ja/strings.xml
+++ b/app/src/debug/res/values-ja/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catimaデバーグ</string>
+</resources>
--- a/app/src/debug/res/values-lb/strings.xml
+++ b/app/src/debug/res/values-lb/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Feelerkorrektur</string>
+</resources>
--- a/app/src/debug/res/values-lt/strings.xml
+++ b/app/src/debug/res/values-lt/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Klaidų Taisymas</string>
+</resources>
--- a/app/src/debug/res/values-lv/strings.xml
+++ b/app/src/debug/res/values-lv/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima atkļūdošana</string>
+</resources>
--- a/app/src/debug/res/values-ml/strings.xml
+++ b/app/src/debug/res/values-ml/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">കാറ്റിമ ഡീബഗ്</string>
+</resources>
--- a/app/src/debug/res/values-mr/strings.xml
+++ b/app/src/debug/res/values-mr/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">कॅटिमा डीबग</string>
+</resources>
--- a/app/src/debug/res/values-oc/strings.xml
+++ b/app/src/debug/res/values-oc/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Correcion d\'Errors</string>
+</resources>
--- a/app/src/debug/res/values-sl/strings.xml
+++ b/app/src/debug/res/values-sl/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Odpravljanje Napak</string>
+</resources>
--- a/app/src/debug/res/values-sv/strings.xml
+++ b/app/src/debug/res/values-sv/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>
--- a/app/src/debug/res/values-ta/strings.xml
+++ b/app/src/debug/res/values-ta/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">கேட்டிமா Debug</string>
+</resources>
--- a/app/src/debug/res/values-tr/strings.xml
+++ b/app/src/debug/res/values-tr/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Catima Hata Ayaklama</string>
-</resources>
+    <string name="app_name">Catima Hata Ayıklama</string>
+</resources>
--- a/app/src/debug/res/values-tzm/strings.xml
+++ b/app/src/debug/res/values-tzm/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ⴽⴰⵜⵉⵎⴰ ⴰⵙⵔⴰⵡ</string>
+</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/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"
@@ -40,12 +54,28 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="image/*" />
+                <data android:mimeType="application/pdf" />
+                <data android:mimeType="application/vnd.apple.pkpass" />
+                <data android:mimeType="application/vnd-com.apple.pkpass" />
+                <data android:mimeType="application/vnd.espass-espass" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+
                <data android:mimeType="text/plain" />
                <data android:mimeType="image/*" />
                <data android:mimeType="application/pdf" />
+                <data android:mimeType="application/vnd.apple.pkpass" />
+                <data android:mimeType="application/vnd-com.apple.pkpass" />
+                <data android:mimeType="application/vnd.espass-espass" />
            </intent-filter>
        </activity>
        <activity
@@ -59,17 +89,17 @@
        <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"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
+            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".LoyaltyCardEditActivity"
            android:exported="true"
            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden">
+            android:windowSoftInputMode="adjustResize">
            <intent-filter
                android:autoVerify="true"
                android:label="@string/app_name">
@@ -107,8 +137,7 @@
        <activity
            android:name=".BarcodeSelectorActivity"
            android:label="@string/selectBarcodeTitle"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
+            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".preferences.SettingsActivity"
            android:label="@string/settings"
@@ -183,7 +212,8 @@
                android:resource="@xml/file_provider_paths" />
        </provider>
        <service android:name=".CardsOnPowerScreenService" android:label="@string/app_name"
-            android:permission="android.permission.BIND_CONTROLS" android:exported="true">
+            android:permission="android.permission.BIND_CONTROLS" android:exported="true"
+            tools:targetApi="r">
            <intent-filter>
                <action android:name="android.service.controls.ControlsProviderService" />
            </intent-filter>
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -1,147 +0,0 @@
-package protect.card_locker;
-
-import android.os.Bundle;
-import android.text.Spanned;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import protect.card_locker.databinding.AboutActivityBinding;
-
-public class AboutActivity extends CatimaAppCompatActivity {
-
-    private static final String TAG = "Catima";
-
-    private AboutActivityBinding binding;
-    private AboutContent content;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = AboutActivityBinding.inflate(getLayoutInflater());
-        content = new AboutContent(this);
-        setTitle(content.getPageTitle());
-        setContentView(binding.getRoot());
-        setSupportActionBar(binding.toolbar);
-        enableToolbarBackButton();
-
-        TextView copyright = binding.creditsSub;
-        copyright.setText(content.getCopyrightShort());
-        TextView versionHistory = binding.versionHistorySub;
-        versionHistory.setText(content.getVersionHistory());
-
-        binding.versionHistory.setTag("https://catima.app/changelog/");
-        binding.translate.setTag("https://hosted.weblate.org/engage/catima/");
-        binding.license.setTag("https://github.com/CatimaLoyalty/Android/blob/main/LICENSE");
-        binding.repo.setTag("https://github.com/CatimaLoyalty/Android/");
-        binding.privacy.setTag("https://catima.app/privacy-policy/");
-        binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues");
-        binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
-        binding.donate.setTag("https://catima.app/donate");
-
-        boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
-        // Hide Google Play rate button if not on Google Play
-        binding.rate.setVisibility(installedFromGooglePlay ? View.VISIBLE : View.GONE);
-        // Hide donate button on Google Play (Google Play doesn't allow donation links)
-        binding.donate.setVisibility(installedFromGooglePlay ? View.GONE : View.VISIBLE);
-
-        bindClickListeners();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            finish();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        content.destroy();
-        clearClickListeners();
-        binding = null;
-    }
-
-    private void bindClickListeners() {
-        binding.versionHistory.setOnClickListener(this::showHistory);
-        binding.translate.setOnClickListener(this::openExternalBrowser);
-        binding.license.setOnClickListener(this::showLicense);
-        binding.repo.setOnClickListener(this::openExternalBrowser);
-        binding.privacy.setOnClickListener(this::showPrivacy);
-        binding.reportError.setOnClickListener(this::openExternalBrowser);
-        binding.rate.setOnClickListener(this::openExternalBrowser);
-        binding.donate.setOnClickListener(this::openExternalBrowser);
-
-        binding.credits.setOnClickListener(view -> showCredits());
-    }
-
-    private void clearClickListeners() {
-        binding.versionHistory.setOnClickListener(null);
-        binding.translate.setOnClickListener(null);
-        binding.license.setOnClickListener(null);
-        binding.repo.setOnClickListener(null);
-        binding.privacy.setOnClickListener(null);
-        binding.reportError.setOnClickListener(null);
-        binding.rate.setOnClickListener(null);
-        binding.donate.setOnClickListener(null);
-
-        binding.credits.setOnClickListener(null);
-    }
-
-    private void showCredits() {
-        showHTML(R.string.credits, content.getContributorInfo(), null);
-    }
-
-    private void showHistory(View view) {
-        showHTML(R.string.version_history, content.getHistoryInfo(), view);
-    }
-
-    private void showLicense(View view) {
-        showHTML(R.string.license, content.getLicenseInfo(), view);
-    }
-
-    private void showPrivacy(View view) {
-        showHTML(R.string.privacy_policy, content.getPrivacyInfo(), view);
-    }
-
-    private void showHTML(@StringRes int title, final Spanned text, @Nullable View view) {
-        int dialogContentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        TextView textView = new TextView(this);
-        textView.setText(text);
-        Utils.makeTextViewLinksClickable(textView, text);
-        ScrollView scrollView = new ScrollView(this);
-        scrollView.addView(textView);
-        scrollView.setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0);
-
-        // Create dialog
-        MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(this);
-        materialAlertDialogBuilder
-                .setTitle(title)
-                .setView(scrollView)
-                .setPositiveButton(R.string.ok, null);
-
-        // Add View online button if an URL is linked to this view
-        if (view != null && view.getTag() != null) {
-            materialAlertDialogBuilder.setNeutralButton(R.string.view_online, (dialog, which) -> openExternalBrowser(view));
-        }
-
-        // Show dialog
-        materialAlertDialogBuilder.show();
-    }
-
-    private void openExternalBrowser(View view) {
-        Object tag = view.getTag();
-        if (tag instanceof String && ((String) tag).startsWith("https://")) {
-            (new OpenWebLinkHandler()).openBrowser(this, (String) tag);
-        }
-    }
-}
--- a/app/src/main/java/protect/card_locker/AboutActivity.kt
+++ b/app/src/main/java/protect/card_locker/AboutActivity.kt
@@ -0,0 +1,149 @@
+package protect.card_locker
+
+import android.os.Bundle
+import android.text.Spanned
+import android.view.MenuItem
+import android.view.View
+import android.widget.ScrollView
+import android.widget.TextView
+
+import androidx.annotation.StringRes
+import androidx.core.view.isVisible
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+import protect.card_locker.databinding.AboutActivityBinding
+
+class AboutActivity : CatimaAppCompatActivity() {
+    private companion object {
+        private const val TAG = "Catima"
+    }
+
+    private lateinit var binding: AboutActivityBinding
+    private lateinit var content: AboutContent
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = AboutActivityBinding.inflate(layoutInflater)
+        content = AboutContent(this)
+        title = content.pageTitle
+        setContentView(binding.root)
+        setSupportActionBar(binding.toolbar)
+        enableToolbarBackButton()
+
+        binding.apply {
+            creditsSub.text = content.copyrightShort
+            versionHistorySub.text = content.versionHistory
+
+            versionHistory.tag = "https://catima.app/changelog/"
+            translate.tag = "https://hosted.weblate.org/engage/catima/"
+            license.tag = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE"
+            repo.tag = "https://github.com/CatimaLoyalty/Android/"
+            privacy.tag = "https://catima.app/privacy-policy/"
+            reportError.tag = "https://github.com/CatimaLoyalty/Android/issues"
+            rate.tag = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
+            donate.tag = "https://catima.app/donate"
+
+            // Hide Google Play rate button if not on Google Play
+            rate.isVisible = BuildConfig.showRateOnGooglePlay
+            // Hide donate button on Google Play (Google Play doesn't allow donation links)
+            donate.isVisible = BuildConfig.showDonate
+        }
+
+        bindClickListeners()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                finish()
+                true
+            }
+
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        content.destroy()
+        clearClickListeners()
+    }
+
+    private fun bindClickListeners() {
+        binding.apply {
+            versionHistory.setOnClickListener { showHistory(it) }
+            translate.setOnClickListener { openExternalBrowser(it) }
+            license.setOnClickListener { showLicense(it) }
+            repo.setOnClickListener { openExternalBrowser(it) }
+            privacy.setOnClickListener { showPrivacy(it) }
+            reportError.setOnClickListener { openExternalBrowser(it) }
+            rate.setOnClickListener { openExternalBrowser(it) }
+            donate.setOnClickListener { openExternalBrowser(it) }
+            credits.setOnClickListener { showCredits() }
+        }
+    }
+
+    private fun clearClickListeners() {
+        binding.apply {
+            versionHistory.setOnClickListener(null)
+            translate.setOnClickListener(null)
+            license.setOnClickListener(null)
+            repo.setOnClickListener(null)
+            privacy.setOnClickListener(null)
+            reportError.setOnClickListener(null)
+            rate.setOnClickListener(null)
+            donate.setOnClickListener(null)
+            credits.setOnClickListener(null)
+        }
+    }
+
+    private fun showCredits() {
+        showHTML(R.string.credits, content.contributorInfo, null)
+    }
+
+    private fun showHistory(view: View) {
+        showHTML(R.string.version_history, content.historyInfo, view)
+    }
+
+    private fun showLicense(view: View) {
+        showHTML(R.string.license, content.licenseInfo, view)
+    }
+
+    private fun showPrivacy(view: View) {
+        showHTML(R.string.privacy_policy, content.privacyInfo, view)
+    }
+
+    private fun showHTML(@StringRes title: Int, text: Spanned, view: View?) {
+        val dialogContentPadding = resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
+        val textView = TextView(this).apply {
+            setText(text)
+            Utils.makeTextViewLinksClickable(this, text)
+        }
+
+        val scrollView = ScrollView(this).apply {
+            addView(textView)
+            setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0)
+        }
+
+        MaterialAlertDialogBuilder(this).apply {
+            setTitle(title)
+            setView(scrollView)
+            setPositiveButton(R.string.ok, null)
+
+            // Add View online button if an URL is linked to this view
+            view?.tag?.let {
+                setNeutralButton(R.string.view_online) { _, _ -> openExternalBrowser(view) }
+            }
+
+            show()
+        }
+    }
+
+    private fun openExternalBrowser(view: View) {
+        val tag = view.tag
+        if (tag is String && tag.startsWith("https://")) {
+            OpenWebLinkHandler().openBrowser(this, tag)
+        }
+    }
+}
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -49,7 +49,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
    BarcodeImageWriterTask(
            Context context, ImageView imageView, String cardIdString,
            CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding
+            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
    ) {
        mContext = context;

@@ -86,13 +86,13 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {

        if (format.isSquare()) {
            imageHeight = imageWidth = Math.min(imageViewHeight, Math.min(MAX_WIDTH, imageViewWidth));
-        } else if (imageView.getWidth() < MAX_WIDTH) {
+        } else if (imageView.getWidth() < MAX_WIDTH && !isFullscreen) {
            imageHeight = imageViewHeight;
            imageWidth = imageViewWidth;
        } else {
            // Scale down the image to reduce the memory needed to produce it
-            imageWidth = MAX_WIDTH;
-            double ratio = (double) MAX_WIDTH / (double) imageViewWidth;
+            imageWidth = Math.min(MAX_WIDTH, this.mContext.getResources().getDisplayMetrics().widthPixels);
+            double ratio = (double) imageWidth / (double) imageViewWidth;
            imageHeight = (int) (imageViewHeight * ratio);
        }

--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -1,125 +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());
-        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("initialCardId") : 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();
-    }
-}
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.kt
+++ b/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()
+    }
+    
+}
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
@@ -92,13 +92,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>

                            Log.d(TAG, "Generating barcode for type " + formatType);

-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                        }
                    });
        } else {
            Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
--- a/app/src/main/java/protect/card_locker/BarcodeValues.java
+++ b/app/src/main/java/protect/card_locker/BarcodeValues.java
@@ -1,26 +0,0 @@
-package protect.card_locker;
-
-public class BarcodeValues {
-    private final String mFormat;
-    private final String mContent;
-    private String mNote;
-
-    public BarcodeValues(String format, String content) {
-        mFormat = format;
-        mContent = content;
-    }
-
-    public void setNote(String note) {
-        mNote = note;
-    }
-
-    public String format() {
-        return mFormat;
-    }
-
-    public String content() {
-        return mContent;
-    }
-
-    public String note() { return mNote; }
-}
--- a/app/src/main/java/protect/card_locker/BarcodeValuesListDisambiguatorCallback.java
+++ b/app/src/main/java/protect/card_locker/BarcodeValuesListDisambiguatorCallback.java
@@ -1,6 +0,0 @@
-package protect.card_locker;
-
-public interface BarcodeValuesListDisambiguatorCallback {
-    void onUserChoseBarcode(BarcodeValues barcodeValues);
-    void onUserDismissedSelector();
-}
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -1,105 +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 androidx.recyclerview.widget.RecyclerView;
-
-import protect.card_locker.databinding.SimpleToolbarListActivityBinding;
-
-/**
- * The configuration screen for creating a shortcut.
- */
-public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
-    private SimpleToolbarListActivityBinding binding;
-    static final String TAG = "Catima";
-    private SQLiteDatabase mDatabase;
-    private LoyaltyCardCursorAdapter mAdapter;
-
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        binding = SimpleToolbarListActivityBinding.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());
-        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();
-        }
-
-        final RecyclerView cardList = binding.list;
-        GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
-        if (layoutManager != null) {
-            layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
-        }
-
-        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this, null);
-        cardList.setAdapter(mAdapter);
-    }
-
-    private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
-        selected.moveToPosition(position);
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(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
-    }
-}
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.kt
+++ b/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
+    }
+}
--- a/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
+++ b/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
@@ -42,10 +42,10 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
        return subscriber -> {
            while (loyaltyCardCursor.moveToNext()) {
-                LoyaltyCard card = LoyaltyCard.toLoyaltyCard(loyaltyCardCursor);
+                LoyaltyCard card = LoyaltyCard.fromCursor(this, loyaltyCardCursor);
                Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        .putExtra("id", card.id);
+                        .putExtra(LoyaltyCardViewActivity.BUNDLE_ID, card.id);
                PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
                subscriber.onNext(
                        new Control.StatelessBuilder(PREFIX + card.id, pendingIntent)
@@ -69,11 +69,11 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
            for (String controlId : controlIds) {
                Control control;
                Integer cardId = this.controlIdToCardId(controlId);
-                LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                LoyaltyCard card = DBHelper.getLoyaltyCard(this, mDatabase, cardId);
                if (card != null) {
                    Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .putExtra("id", card.id);
+                            .putExtra(LoyaltyCardViewActivity.BUNDLE_ID, card.id);
                    PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
                    control = new Control.StatefulBuilder(controlId, pendingIntent)
                            .setTitle(card.store)
@@ -99,7 +99,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
    }

    private Bitmap getIcon(Context context, LoyaltyCard loyaltyCard) {
-        Bitmap cardIcon = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        Bitmap cardIcon = loyaltyCard.getImageThumbnail(context);

        if (cardIcon != null) {
            return cardIcon;
@@ -129,7 +129,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
        consumer.accept(ControlAction.RESPONSE_OK);
        Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra("id", controlIdToCardId(controlId));
+                .putExtra(LoyaltyCardViewActivity.BUNDLE_ID, controlIdToCardId(controlId));
        startActivity(openIntent);

        closePowerScreenOnAndroid11();
--- a/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
+++ b/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.Window;

+import androidx.activity.EdgeToEdge;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -24,6 +25,7 @@ public class CatimaAppCompatActivity extends AppCompatActivity {

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        EdgeToEdge.enable(this);
        super.onCreate(savedInstanceState);
        Utils.patchColors(this);
    }
--- a/app/src/main/java/protect/card_locker/CatimaBarcode.java
+++ b/app/src/main/java/protect/card_locker/CatimaBarcode.java
@@ -1,5 +1,7 @@
 package protect.card_locker;

+import androidx.annotation.NonNull;
+
 import com.google.zxing.BarcodeFormat;

 import java.util.Arrays;
@@ -45,15 +47,15 @@ public class CatimaBarcode {
        mBarcodeFormat = barcodeFormat;
    }

-    public static CatimaBarcode fromBarcode(BarcodeFormat barcodeFormat) {
+    public static CatimaBarcode fromBarcode(@NonNull BarcodeFormat barcodeFormat) {
        return new CatimaBarcode(barcodeFormat);
    }

-    public static CatimaBarcode fromName(String name) {
+    public static CatimaBarcode fromName(@NonNull String name) {
        return new CatimaBarcode(BarcodeFormat.valueOf(name));
    }

-    public static CatimaBarcode fromPrettyName(String prettyName) {
+    public static CatimaBarcode fromPrettyName(@NonNull String prettyName) {
        try {
            return new CatimaBarcode(barcodeFormats.get(barcodePrettyNames.indexOf(prettyName)));
        } catch (IndexOutOfBoundsException e) {
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -23,10 +23,11 @@ import java.util.Set;
 public class DBHelper extends SQLiteOpenHelper {
    public static final String DATABASE_NAME = "Catima.db";
    public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 16;
+    public static final int DATABASE_VERSION = 17;

-    // NB: changing this value requires a migration
+    // NB: changing these values requires a migration
    public static final int DEFAULT_ZOOM_LEVEL = 100;
+    public static final int DEFAULT_ZOOM_LEVEL_WIDTH = 100;

    public static class LoyaltyCardDbGroups {
        public static final String TABLE = "groups";
@@ -51,6 +52,7 @@ public class DBHelper extends SQLiteOpenHelper {
        public static final String STAR_STATUS = "starstatus";
        public static final String LAST_USED = "lastused";
        public static final String ZOOM_LEVEL = "zoomlevel";
+        public static final String ZOOM_LEVEL_WIDTH = "zoomlevelwidth";
        public static final String ARCHIVE_STATUS = "archive";
    }

@@ -70,6 +72,7 @@ public class DBHelper extends SQLiteOpenHelper {
    public enum LoyaltyCardOrder {
        Alpha,
        LastUsed,
+        ValidFrom,
        Expiry
    }

@@ -112,6 +115,7 @@ public class DBHelper extends SQLiteOpenHelper {
                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
+                LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
                LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");

        // create associative table for cards in groups
@@ -326,16 +330,21 @@ public class DBHelper extends SQLiteOpenHelper {
            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                    + " ADD COLUMN " + LoyaltyCardDbIds.VALID_FROM + " INTEGER");
        }
+
+        if (oldVersion < 17 && newVersion >= 17) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '100' ");
+        }
    }

    public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
        Set<String> files = new HashSet<>();
        Cursor cardCursor = getLoyaltyCardCursor(database);
        while (cardCursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor);
            for (ImageLocationType imageLocationType : ImageLocationType.values()) {
                String name = Utils.getCardImageFileName(card.id, imageLocationType);
-                if (Utils.retrieveCardImageAsFile(context, name).exists()) {
+                if (card.getImageForImageLocationType(context, imageLocationType) != null) {
                    files.add(name);
                }
            }
@@ -515,15 +524,17 @@ public class DBHelper extends SQLiteOpenHelper {
        return (rowsUpdated == 1);
    }

-    public static boolean updateLoyaltyCardZoomLevel(SQLiteDatabase database, int loyaltyCardId, int zoomLevel) {
+    public static boolean updateLoyaltyCardZoomLevel(SQLiteDatabase database, int loyaltyCardId, int zoomLevel, int zoomLevelWidth) {
        ContentValues contentValues = new ContentValues();
        contentValues.put(LoyaltyCardDbIds.ZOOM_LEVEL, zoomLevel);
+        contentValues.put(LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH, zoomLevelWidth);
        Log.d("updateLoyaltyCardZLevel", "Card Id = " + loyaltyCardId + " Zoom level= " + zoomLevel);
+        Log.d("updateLoyaltyCardZoomLW", "Card Id = " + loyaltyCardId + " Zoom level width= " + zoomLevelWidth);
        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                whereAttrs(LoyaltyCardDbIds.ID),
                withArgs(loyaltyCardId));
-        Log.d("updateLoyaltyCardZLevel", "Rows changed = " + rowsUpdated);
-        return (rowsUpdated == 1);
+        Log.d("updateLoyaltyCardZLevel", "Card Id = " + loyaltyCardId + " Zoom level = " + zoomLevel + " Zoom level width = " + zoomLevelWidth);
+        return (rowsUpdated >= 1);
    }

    public static boolean updateLoyaltyCardBalance(SQLiteDatabase database, final int id, final BigDecimal newBalance) {
@@ -535,14 +546,14 @@ public class DBHelper extends SQLiteOpenHelper {
        return (rowsUpdated == 1);
    }

-    public static LoyaltyCard getLoyaltyCard(SQLiteDatabase database, final int id) {
+    public static LoyaltyCard getLoyaltyCard(Context context, SQLiteDatabase database, final int id) {
        Cursor data = database.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);

        LoyaltyCard card = null;

        if (data.getCount() == 1) {
            data.moveToFirst();
-            card = LoyaltyCard.toLoyaltyCard(data);
+            card = LoyaltyCard.fromCursor(context, data);
        }

        data.close();
@@ -916,6 +927,10 @@ public class DBHelper extends SQLiteOpenHelper {
            return LoyaltyCardDbIds.LAST_USED;
        }

+        if (order == LoyaltyCardOrder.ValidFrom) {
+            return LoyaltyCardDbIds.VALID_FROM;
+        }
+
        if (order == LoyaltyCardOrder.Expiry) {
            return LoyaltyCardDbIds.EXPIRY;
        }
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -50,7 +50,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {

    private ActivityResultLauncher<Intent> fileCreateLauncher;
    private ActivityResultLauncher<String> fileOpenLauncher;
-    private ActivityResultLauncher<Intent> filePickerLauncher;

    final private TaskHandler mTasks = new TaskHandler();

@@ -60,13 +59,14 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        binding = ImportExportActivityBinding.inflate(getLayoutInflater());
        setTitle(R.string.importExport);
        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
        Toolbar toolbar = binding.toolbar;
        setSupportActionBar(toolbar);
        enableToolbarBackButton();

        Intent fileIntent = getIntent();
        if (fileIntent != null && fileIntent.getType() != null) {
-            chooseImportType(false, fileIntent.getData());
+            chooseImportType(fileIntent.getData());
        }

        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
@@ -104,19 +104,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
            }
            openFileForImport(result, null);
        });
-        filePickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            Intent intent = result.getData();
-            if (intent == null) {
-                Log.e(TAG, "Activity returned NULL data");
-                return;
-            }
-            Uri uri = intent.getData();
-            if (uri == null) {
-                Log.e(TAG, "Activity returned NULL uri");
-                return;
-            }
-            openFileForImport(intent.getData(), null);
-        });

        // Check that there is a file manager available
        final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
@@ -159,11 +146,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {

        // Check that there is a file manager available
        Button importFilesystem = binding.importOptionFilesystemButton;
-        importFilesystem.setOnClickListener(v -> chooseImportType(false, null));
-
-        // Check that there is an app that data can be imported from
-        Button importApplication = binding.importOptionApplicationButton;
-        importApplication.setOnClickListener(v -> chooseImportType(true, null));
+        importFilesystem.setOnClickListener(v -> chooseImportType(null));

        // FIXME: The importer/exporter is currently quite broken
        // To prevent the screen from turning off during import/export and some devices killing Catima as it's no longer foregrounded, force the screen to stay on here
@@ -188,8 +171,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        }.start();
    }

-    private void chooseImportType(boolean choosePicker,
-                                  @Nullable Uri fileData) {
+    private void chooseImportType(@Nullable Uri fileData) {

        List<CharSequence> betaImportOptions = new ArrayList<>();
        betaImportOptions.add("Fidme");
@@ -250,20 +232,12 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                    new MaterialAlertDialogBuilder(this)
                            .setTitle(importAlertTitle)
                            .setMessage(importAlertMessage)
-                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    try {
-                                        if (choosePicker) {
-                                            final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
-                                            filePickerLauncher.launch(intentPickAction);
-                                        } else {
-                                            fileOpenLauncher.launch("*/*");
-                                        }
-                                    } catch (ActivityNotFoundException e) {
-                                        Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
-                                        Log.e(TAG, "No activity found to handle intent", e);
-                                    }
+                            .setPositiveButton(R.string.ok, (dialog1, which1) -> {
+                                try {
+                                    fileOpenLauncher.launch("*/*");
+                                } catch (ActivityNotFoundException e) {
+                                    Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
+                                    Log.e(TAG, "No activity found to handle intent", e);
                                }
                            })
                            .setNegativeButton(R.string.cancel, null)
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/app/src/main/java/protect/card_locker/ImportExportTask.java
@@ -91,18 +91,14 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
        progress = new ProgressDialog(activity);
        progress.setTitle(doImport ? R.string.importing : R.string.exporting);

-        progress.setOnCancelListener(dialog -> cancel(doImport, true));
-        progress.setOnDismissListener(dialog -> cancel(doImport, true));
+        progress.setOnCancelListener(dialog -> cancel());
+        progress.setOnDismissListener(dialog -> cancel());

        progress.show();
    }

-    private void cancel(boolean isImport, boolean showToast) {
+    private void cancel() {
        ImportExportTask.this.stop();
-
-        if (showToast) {
-            Toast.makeText(activity, isImport ? R.string.importCancelled : R.string.exportCancelled, Toast.LENGTH_LONG).show();
-        }
    }

    protected ImportExportResult doInBackground(Void... nothing) {
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -125,7 +125,30 @@ public class ImportURIHelper {
                headerColor = Integer.parseInt(unparsedHeaderColor);
            }

-            return new LoyaltyCard(-1, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100, 0);
+            return new LoyaltyCard(
+                    -1,
+                    store,
+                    note,
+                    validFrom,
+                    expiry,
+                    balance,
+                    balanceType,
+                    cardId,
+                    barcodeId,
+                    barcodeType,
+                    headerColor,
+                    0,
+                    Utils.getUnixTime(),
+                    100,
+                    100,
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+            );
        } catch (NumberFormatException | UnsupportedEncodingException | ArrayIndexOutOfBoundsException ex) {
            throw new InvalidObjectException("Not a valid import URI");
        }
--- a/app/src/main/java/protect/card_locker/ListWidget.kt
+++ b/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
+    }
+}
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -1,8 +1,9 @@
 package protect.card_locker;

+import android.content.Context;
 import android.database.Cursor;
-import android.os.Parcel;
-import android.os.Parcelable;
+import android.graphics.Bitmap;
+import android.os.Bundle;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -10,142 +11,577 @@ import androidx.annotation.Nullable;
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
+import java.util.List;
+import java.util.Objects;

-public class LoyaltyCard implements Parcelable {
-    public final int id;
-    public final String store;
-    public final String note;
+public class LoyaltyCard {
+    public int id;
+    public String store;
+    public String note;
    @Nullable
-    public final Date validFrom;
+    public Date validFrom;
    @Nullable
-    public final Date expiry;
-    public final BigDecimal balance;
+    public Date expiry;
+    public BigDecimal balance;
    @Nullable
-    public final Currency balanceType;
-    public final String cardId;
+    public Currency balanceType;
+    public String cardId;
    @Nullable
-    public final String barcodeId;
+    public String barcodeId;
    @Nullable
-    public final CatimaBarcode barcodeType;
+    public CatimaBarcode barcodeType;
    @Nullable
-    public final Integer headerColor;
-    public final int starStatus;
-    public final int archiveStatus;
-    public final long lastUsed;
+    public Integer headerColor;
+    public int starStatus;
+    public long lastUsed;
    public int zoomLevel;
+    public int zoomLevelWidth;
+    public int archiveStatus;

+
+    @Nullable
+    private Bitmap imageThumbnail;
+    @Nullable
+    private String imageThumbnailPath;
+    @Nullable
+    private Bitmap imageFront;
+    @Nullable
+    private String imageFrontPath;
+    @Nullable
+    private Bitmap imageBack;
+    @Nullable
+    private String imageBackPath;
+
+    public static final String BUNDLE_LOYALTY_CARD_ID = "loyaltyCardId";
+    public static final String BUNDLE_LOYALTY_CARD_STORE = "loyaltyCardStore";
+    public static final String BUNDLE_LOYALTY_CARD_NOTE = "loyaltyCardNote";
+    public static final String BUNDLE_LOYALTY_CARD_VALID_FROM = "loyaltyCardValidFrom";
+    public static final String BUNDLE_LOYALTY_CARD_EXPIRY = "loyaltyCardExpiry";
+    public static final String BUNDLE_LOYALTY_CARD_BALANCE = "loyaltyCardBalance";
+    public static final String BUNDLE_LOYALTY_CARD_BALANCE_TYPE = "loyaltyCardBalanceType";
+    public static final String BUNDLE_LOYALTY_CARD_CARD_ID = "loyaltyCardCardId";
+    public static final String BUNDLE_LOYALTY_CARD_BARCODE_ID = "loyaltyCardBarcodeId";
+    public static final String BUNDLE_LOYALTY_CARD_BARCODE_TYPE = "loyaltyCardBarcodeType";
+    public static final String BUNDLE_LOYALTY_CARD_HEADER_COLOR = "loyaltyCardHeaderColor";
+    public static final String BUNDLE_LOYALTY_CARD_STAR_STATUS = "loyaltyCardStarStatus";
+    public static final String BUNDLE_LOYALTY_CARD_LAST_USED = "loyaltyCardLastUsed";
+    public static final String BUNDLE_LOYALTY_CARD_ZOOM_LEVEL = "loyaltyCardZoomLevel";
+    public static final String BUNDLE_LOYALTY_CARD_ZOOM_LEVEL_WIDTH = "loyaltyCardZoomLevelWidth";
+    public static final String BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS = "loyaltyCardArchiveStatus";
+    public static final String BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL = "loyaltyCardImageThumbnail";
+    public static final String BUNDLE_LOYALTY_CARD_IMAGE_FRONT = "loyaltyCardImageFront";
+    public static final String BUNDLE_LOYALTY_CARD_IMAGE_BACK = "loyaltyCardImageBack";
+
+    private static final String TEMP_IMAGE_THUMBNAIL_FILE_NAME = "loyaltyCardTempImageThumbnailFileName";
+    private static final String TEMP_IMAGE_FRONT_FILE_NAME = "loyaltyCardTempImageFrontFileName";
+    private static final String TEMP_IMAGE_BACK_FILE_NAME = "loyaltyCardTempImageBackFileName";
+
+    /**
+     * Create a loyalty card object with default values
+     */
+    public LoyaltyCard() {
+        setId(-1);
+        setStore("");
+        setNote("");
+        setValidFrom(null);
+        setExpiry(null);
+        setBalance(new BigDecimal("0"));
+        setBalanceType(null);
+        setCardId("");
+        setBarcodeId(null);
+        setBarcodeType(null);
+        setHeaderColor(null);
+        setStarStatus(0);
+        setLastUsed(Utils.getUnixTime());
+        setZoomLevel(100);
+        setZoomLevelWidth(100);
+        setArchiveStatus(0);
+        setImageThumbnail(null, null);
+        setImageFront(null, null);
+        setImageBack(null, null);
+    }
+
+    /**
+     * Create a new loyalty card
+     *
+     * @param id
+     * @param store
+     * @param note
+     * @param validFrom
+     * @param expiry
+     * @param balance
+     * @param balanceType
+     * @param cardId
+     * @param barcodeId
+     * @param barcodeType
+     * @param headerColor
+     * @param starStatus
+     * @param lastUsed
+     * @param zoomLevel
+     * @param zoomLevelWidth
+     * @param archiveStatus
+     */
    public LoyaltyCard(final int id, final String store, final String note, @Nullable final Date validFrom,
                       @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
                       final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
                       @Nullable final Integer headerColor, final int starStatus,
-                       final long lastUsed, final int zoomLevel, final int archiveStatus) {
+                       final long lastUsed, final int zoomLevel, final int zoomLevelWidth, final int archiveStatus,
+                       @Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath,
+                       @Nullable Bitmap imageFront, @Nullable String imageFrontPath,
+                       @Nullable Bitmap imageBack, @Nullable String imageBackPath) {
+        setId(id);
+        setStore(store);
+        setNote(note);
+        setValidFrom(validFrom);
+        setExpiry(expiry);
+        setBalance(balance);
+        setBalanceType(balanceType);
+        setCardId(cardId);
+        setBarcodeId(barcodeId);
+        setBarcodeType(barcodeType);
+        setHeaderColor(headerColor);
+        setStarStatus(starStatus);
+        setLastUsed(lastUsed);
+        setZoomLevel(zoomLevel);
+        setZoomLevelWidth(zoomLevelWidth);
+        setArchiveStatus(archiveStatus);
+        setImageThumbnail(imageThumbnail, imageThumbnailPath);
+        setImageFront(imageFront, imageFrontPath);
+        setImageBack(imageBack, imageBackPath);
+    }
+
+    @Nullable
+    public Bitmap getImageThumbnail(Context context) {
+        if (imageThumbnailPath != null) {
+            if (imageThumbnailPath.equals(TEMP_IMAGE_THUMBNAIL_FILE_NAME)) {
+                imageThumbnail = Utils.loadTempImage(context, imageThumbnailPath);
+            } else {
+                imageThumbnail = Utils.retrieveCardImage(context, imageThumbnailPath);
+            }
+            imageThumbnailPath = null;
+        }
+
+        if (imageThumbnail == null) {
+            return null;
+        }
+
+        return imageThumbnail.copy(imageThumbnail.getConfig(), imageThumbnail.isMutable());
+    }
+
+    @Nullable
+    public Bitmap getImageFront(Context context) {
+        if (imageFrontPath != null) {
+            if (imageFrontPath.equals(TEMP_IMAGE_FRONT_FILE_NAME)) {
+                imageFront = Utils.loadTempImage(context, imageFrontPath);
+            } else {
+                imageFront = Utils.retrieveCardImage(context, imageFrontPath);
+            }
+            imageFrontPath = null;
+        }
+
+        if (imageFront == null) {
+            return null;
+        }
+
+        return imageFront.copy(imageFront.getConfig(), imageFront.isMutable());
+    }
+
+    @Nullable
+    public Bitmap getImageBack(Context context) {
+        if (imageBackPath != null) {
+            if (imageBackPath.equals(TEMP_IMAGE_BACK_FILE_NAME)) {
+                imageBack = Utils.loadTempImage(context, imageBackPath);
+            } else {
+                imageBack = Utils.retrieveCardImage(context, imageBackPath);
+            }
+            imageBackPath = null;
+        }
+
+        if (imageBack == null) {
+            return null;
+        }
+
+        return imageBack.copy(imageBack.getConfig(), imageBack.isMutable());
+    }
+
+    public void setId(int id) {
        this.id = id;
+    }
+
+    public void setStore(@NonNull String store) {
        this.store = store;
+    }
+
+    public void setNote(@NonNull String note) {
        this.note = note;
+    }
+
+    public void setValidFrom(@Nullable Date validFrom) {
        this.validFrom = validFrom;
+    }
+
+    public void setExpiry(@Nullable Date expiry) {
        this.expiry = expiry;
+    }
+
+    public void setBalance(@NonNull BigDecimal balance) {
        this.balance = balance;
+    }
+
+    public void setBalanceType(@Nullable Currency balanceType) {
        this.balanceType = balanceType;
+    }
+
+    public void setCardId(@NonNull String cardId) {
        this.cardId = cardId;
+    }
+
+    public void setBarcodeId(@Nullable String barcodeId) {
        this.barcodeId = barcodeId;
+    }
+
+    public void setBarcodeType(@Nullable CatimaBarcode barcodeType) {
        this.barcodeType = barcodeType;
+    }
+
+    public void setHeaderColor(@Nullable Integer headerColor) {
        this.headerColor = headerColor;
+    }
+
+    public void setStarStatus(int starStatus) {
+        if (starStatus != 0 && starStatus != 1) {
+            throw new IllegalArgumentException("starStatus must be 0 or 1");
+        }
+
        this.starStatus = starStatus;
+    }
+
+    public void setLastUsed(long lastUsed) {
        this.lastUsed = lastUsed;
+    }
+
+    public void setZoomLevel(int zoomLevel) {
+        if (zoomLevel < 0 || zoomLevel > 100) {
+            throw new IllegalArgumentException("zoomLevel must be in range 0-100");
+        }
+
        this.zoomLevel = zoomLevel;
+    }
+
+    public void setZoomLevelWidth(int zoomLevelWidth) {
+        if (zoomLevelWidth < 0 || zoomLevelWidth > 100) {
+            throw new IllegalArgumentException("zoomLevelWidth must be in range 0-100");
+        }
+
+        this.zoomLevelWidth = zoomLevelWidth;
+    }
+
+    public void setArchiveStatus(int archiveStatus) {
+        if (archiveStatus != 0 && archiveStatus != 1) {
+            throw new IllegalArgumentException("archiveStatus must be 0 or 1");
+        }
+
        this.archiveStatus = archiveStatus;
    }

-    protected LoyaltyCard(Parcel in) {
-        id = in.readInt();
-        store = in.readString();
-        note = in.readString();
-        long tmpValidFrom = in.readLong();
-        validFrom = tmpValidFrom != -1 ? new Date(tmpValidFrom) : null;
-        long tmpExpiry = in.readLong();
-        expiry = tmpExpiry != -1 ? new Date(tmpExpiry) : null;
-        balance = (BigDecimal) in.readValue(BigDecimal.class.getClassLoader());
-        balanceType = (Currency) in.readValue(Currency.class.getClassLoader());
-        cardId = in.readString();
-        barcodeId = in.readString();
-        String tmpBarcodeType = in.readString();
-        barcodeType = !tmpBarcodeType.isEmpty() ? CatimaBarcode.fromName(tmpBarcodeType) : null;
-        int tmpHeaderColor = in.readInt();
-        headerColor = tmpHeaderColor != -1 ? tmpHeaderColor : null;
-        starStatus = in.readInt();
-        lastUsed = in.readLong();
-        zoomLevel = in.readInt();
-        archiveStatus = in.readInt();
+    public void setImageThumbnail(@Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath) {
+        if (imageThumbnail != null && imageThumbnailPath != null) {
+            throw new IllegalArgumentException("Cannot set both thumbnail and path");
+        }
+
+        this.imageThumbnailPath = imageThumbnailPath;
+        this.imageThumbnail = imageThumbnail != null ? imageThumbnail.copy(imageThumbnail.getConfig(), imageThumbnail.isMutable()) : null;
    }

-    @Override
-    public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeInt(id);
-        parcel.writeString(store);
-        parcel.writeString(note);
-        parcel.writeLong(validFrom != null ? validFrom.getTime() : -1);
-        parcel.writeLong(expiry != null ? expiry.getTime() : -1);
-        parcel.writeValue(balance);
-        parcel.writeValue(balanceType);
-        parcel.writeString(cardId);
-        parcel.writeString(barcodeId);
-        parcel.writeString(barcodeType != null ? barcodeType.name() : "");
-        parcel.writeInt(headerColor != null ? headerColor : -1);
-        parcel.writeInt(starStatus);
-        parcel.writeLong(lastUsed);
-        parcel.writeInt(zoomLevel);
-        parcel.writeInt(archiveStatus);
+    public void setImageFront(@Nullable Bitmap imageFront, @Nullable String imageFrontPath) {
+        if (imageFront != null && imageFrontPath != null) {
+            throw new IllegalArgumentException("Cannot set both thumbnail and path");
+        }
+
+        this.imageFrontPath = imageFrontPath;
+        this.imageFront = imageFront != null ? imageFront.copy(imageFront.getConfig(), imageFront.isMutable()) : null;
    }

-    public static LoyaltyCard toLoyaltyCard(Cursor cursor) {
+    public void setImageBack(@Nullable Bitmap imageBack, @Nullable String imageBackPath) {
+        if (imageBack != null && imageBackPath != null) {
+            throw new IllegalArgumentException("Cannot set both thumbnail and path");
+        }
+
+        this.imageBackPath = imageBackPath;
+        this.imageBack = imageBack != null ? imageBack.copy(imageBack.getConfig(), imageBack.isMutable()) : null;
+    }
+
+    @Nullable
+    public Bitmap getImageForImageLocationType(Context context, ImageLocationType imageLocationType) {
+        if (imageLocationType == ImageLocationType.icon) {
+            return getImageThumbnail(context);
+        } else if (imageLocationType == ImageLocationType.front) {
+            return getImageFront(context);
+        } else if (imageLocationType == ImageLocationType.back) {
+            return getImageBack(context);
+        }
+
+        throw new IllegalArgumentException("Unknown image location type");
+    }
+
+    public void updateFromBundle(@NonNull Bundle bundle, boolean requireFull) {
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_ID)) {
+            setId(bundle.getInt(BUNDLE_LOYALTY_CARD_ID));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_ID);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_STORE)) {
+            setStore(Objects.requireNonNull(bundle.getString(BUNDLE_LOYALTY_CARD_STORE)));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_STORE);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_NOTE)) {
+            setNote(Objects.requireNonNull(bundle.getString(BUNDLE_LOYALTY_CARD_NOTE)));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_NOTE);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_VALID_FROM)) {
+            long tmpValidFrom = bundle.getLong(BUNDLE_LOYALTY_CARD_VALID_FROM);
+            setValidFrom(tmpValidFrom > 0 ? new Date(tmpValidFrom) : null);
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_VALID_FROM);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_EXPIRY)) {
+            long tmpExpiry = bundle.getLong(BUNDLE_LOYALTY_CARD_EXPIRY);
+            setExpiry(tmpExpiry > 0 ? new Date(tmpExpiry) : null);
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_EXPIRY);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BALANCE)) {
+            setBalance(new BigDecimal(bundle.getString(BUNDLE_LOYALTY_CARD_BALANCE)));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BALANCE);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BALANCE_TYPE)) {
+            String tmpBalanceType = bundle.getString(BUNDLE_LOYALTY_CARD_BALANCE_TYPE);
+            setBalanceType(tmpBalanceType != null ? Currency.getInstance(tmpBalanceType) : null);
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BALANCE_TYPE);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_CARD_ID)) {
+            setCardId(Objects.requireNonNull(bundle.getString(BUNDLE_LOYALTY_CARD_CARD_ID)));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_CARD_ID);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BARCODE_ID)) {
+            setBarcodeId(bundle.getString(BUNDLE_LOYALTY_CARD_BARCODE_ID));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_ID);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BARCODE_TYPE)) {
+            String tmpBarcodeType = bundle.getString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE);
+            setBarcodeType(tmpBarcodeType != null ? CatimaBarcode.fromName(tmpBarcodeType) : null);
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_TYPE);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
+            int tmpHeaderColor = bundle.getInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR);
+            setHeaderColor(tmpHeaderColor != -1 ? tmpHeaderColor : null);
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_HEADER_COLOR);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_STAR_STATUS)) {
+            setStarStatus(bundle.getInt(BUNDLE_LOYALTY_CARD_STAR_STATUS));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_STAR_STATUS);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_LAST_USED)) {
+            setLastUsed(bundle.getLong(BUNDLE_LOYALTY_CARD_LAST_USED));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_LAST_USED);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL)) {
+            setZoomLevel(bundle.getInt(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_ZOOM_LEVEL);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL_WIDTH)) {
+            setZoomLevelWidth(bundle.getInt(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL_WIDTH));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_ZOOM_LEVEL_WIDTH);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS)) {
+            setArchiveStatus(bundle.getInt(BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL)) {
+            setImageThumbnail(null, bundle.getString(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_IMAGE_FRONT)) {
+            setImageFront(null, bundle.getString(BUNDLE_LOYALTY_CARD_IMAGE_FRONT));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_IMAGE_FRONT);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_IMAGE_BACK)) {
+            setImageBack(null, bundle.getString(BUNDLE_LOYALTY_CARD_IMAGE_BACK));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_IMAGE_BACK);
+        }
+    }
+
+    public Bundle toBundle(Context context, List<String> exportLimit) {
+        boolean exportIsLimited = !exportLimit.isEmpty();
+
+        Bundle bundle = new Bundle();
+
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_ID)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_ID, id);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_STORE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_STORE, store);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_NOTE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_NOTE, note);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_VALID_FROM)) {
+            bundle.putLong(BUNDLE_LOYALTY_CARD_VALID_FROM, validFrom != null ? validFrom.getTime() : -1);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_EXPIRY)) {
+            bundle.putLong(BUNDLE_LOYALTY_CARD_EXPIRY, expiry != null ? expiry.getTime() : -1);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BALANCE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BALANCE, balance.toString());
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BALANCE_TYPE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BALANCE_TYPE, balanceType != null ? balanceType.toString() : null);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_CARD_ID)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_CARD_ID, cardId);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_ID)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ID, barcodeId);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_TYPE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor != null ? headerColor : -1);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_STAR_STATUS)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_STAR_STATUS, starStatus);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_LAST_USED)) {
+            bundle.putLong(BUNDLE_LOYALTY_CARD_LAST_USED, lastUsed);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL, zoomLevel);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL_WIDTH)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL_WIDTH, zoomLevelWidth);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS, archiveStatus);
+        }
+        // There is an (undocumented) size limit to bundles of around 2MB(?), when going over it you will experience a random crash
+        // So, instead of storing the bitmaps directly, we write the bitmap to a temp file and store the path
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL)) {
+            Bitmap thumbnail = getImageThumbnail(context);
+            if (thumbnail != null) {
+                Utils.saveTempImage(context, thumbnail, TEMP_IMAGE_THUMBNAIL_FILE_NAME, Bitmap.CompressFormat.PNG);
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL, TEMP_IMAGE_THUMBNAIL_FILE_NAME);
+            } else {
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL, null);
+            }
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_IMAGE_FRONT)) {
+            Bitmap front = getImageFront(context);
+            if (front != null) {
+                Utils.saveTempImage(context, front, TEMP_IMAGE_FRONT_FILE_NAME, Bitmap.CompressFormat.PNG);
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_FRONT, TEMP_IMAGE_FRONT_FILE_NAME);
+            } else {
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_FRONT, null);
+            }
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_IMAGE_BACK)) {
+            Bitmap back = getImageBack(context);
+            if (back != null) {
+                Utils.saveTempImage(context, back, TEMP_IMAGE_BACK_FILE_NAME, Bitmap.CompressFormat.PNG);
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_BACK, TEMP_IMAGE_BACK_FILE_NAME);
+            } else {
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_BACK, null);
+            }
+        }
+
+        return bundle;
+    }
+
+    public static LoyaltyCard fromCursor(Context context, Cursor cursor) {
+        // id
        int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+        // store
        String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
+        // note
        String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+        // validFrom
        long validFromLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.VALID_FROM));
+        Date validFrom = validFromLong > 0 ? new Date(validFromLong) : null;
+        // expiry
        long expiryLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY));
+        Date expiry = expiryLong > 0 ? new Date(expiryLong) : null;
+        // balance
        BigDecimal balance = new BigDecimal(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
-        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
-        String barcodeId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID));
-        int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
-        long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED));
-        int zoomLevel = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL));
-        int archived = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS));
-
-        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
+        // balanceType
        int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
+        Currency balanceType = !cursor.isNull(balanceTypeColumn) ? Currency.getInstance(cursor.getString(balanceTypeColumn)) : null;
+        // cardId
+        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
+        // barcodeId
+        int barcodeIdColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID);
+        String barcodeId = !cursor.isNull(barcodeIdColumn) ? cursor.getString(barcodeIdColumn) : null;
+        // barcodeType
+        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
+        CatimaBarcode barcodeType = !cursor.isNull(barcodeTypeColumn) ? CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn)) : null;
+        // headerColor
        int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
+        Integer headerColor = !cursor.isNull(headerColorColumn) ? cursor.getInt(headerColorColumn) : null;
+        // starStatus
+        int starStatus = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
+        // lastUsed
+        long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED));
+        // zoomLevel
+        int zoomLevel = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL));
+        // zoomLevelWidth
+        int zoomLevelWidth = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH));
+        // archiveStatus
+        int archiveStatus = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS));

-        CatimaBarcode barcodeType = null;
-        Currency balanceType = null;
-        Date validFrom = null;
-        Date expiry = null;
-        Integer headerColor = null;
-
-        if (cursor.isNull(barcodeTypeColumn) == false) {
-            barcodeType = CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn));
-        }
-
-        if (cursor.isNull(balanceTypeColumn) == false) {
-            balanceType = Currency.getInstance(cursor.getString(balanceTypeColumn));
-        }
-
-        if (validFromLong > 0) {
-            validFrom = new Date(validFromLong);
-        }
-
-        if (expiryLong > 0) {
-            expiry = new Date(expiryLong);
-        }
-
-        if (cursor.isNull(headerColorColumn) == false) {
-            headerColor = cursor.getInt(headerColorColumn);
-        }
-
-        return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel, archived);
+        return new LoyaltyCard(
+                id,
+                store,
+                note,
+                validFrom,
+                expiry,
+                balance,
+                balanceType,
+                cardId,
+                barcodeId,
+                barcodeType,
+                headerColor,
+                starStatus,
+                lastUsed,
+                zoomLevel,
+                zoomLevelWidth,
+                archiveStatus,
+                null,
+                Utils.getCardImageFileName(id, ImageLocationType.icon),
+                null,
+                Utils.getCardImageFileName(id, ImageLocationType.front),
+                null,
+                Utils.getCardImageFileName(id, ImageLocationType.back)
+        );
    }

-    public static boolean isDuplicate(final LoyaltyCard a, final LoyaltyCard b) {
-        // Skip lastUsed & zoomLevel
+    public static boolean isDuplicate(Context context, final LoyaltyCard a, final LoyaltyCard b) {
+        // Note: Bitmap comparing is slow, be careful when calling this method
+        // Skip lastUsed & zoomLevel*
        return a.id == b.id && // non-nullable int
                a.store.equals(b.store) && // non-nullable String
                a.note.equals(b.note) && // non-nullable String
@@ -159,12 +595,23 @@ public class LoyaltyCard implements Parcelable {
                        b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
                Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
                a.starStatus == b.starStatus && // non-nullable int
-                a.archiveStatus == b.archiveStatus; // non-nullable int
+                a.archiveStatus == b.archiveStatus && // non-nullable int
+                nullableBitmapsEqual(a.getImageThumbnail(context), b.getImageThumbnail(context)) && // nullable Bitmap
+                nullableBitmapsEqual(a.getImageFront(context), b.getImageFront(context)) && // nullable Bitmap
+                nullableBitmapsEqual(a.getImageBack(context), b.getImageBack(context)); // nullable Bitmap
    }

-    @Override
-    public int describeContents() {
-        return 0;
+    public static boolean nullableBitmapsEqual(@Nullable Bitmap a, @Nullable Bitmap b) {
+        if (a == null && b == null) {
+            return true;
+        }
+
+        if (a != null && b != null) {
+            return a.sameAs(b);
+        }
+
+        // One is null and the other isn't, so it's not equal
+        return false;
    }

    @NonNull
@@ -173,7 +620,8 @@ public class LoyaltyCard implements Parcelable {
        return String.format(
                "LoyaltyCard{%n  id=%s,%n  store=%s,%n  note=%s,%n  validFrom=%s,%n  expiry=%s,%n"
                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n"
-                        + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  archiveStatus=%s%n}",
+                        + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  zoomLevelWidth=%s,%n  archiveStatus=%s%n"
+                        + "  imageThumbnail=%s,%n  imageThumbnailPath=%s,%n  imageFront=%s,%n  imageFrontPath=%s,%n  imageBack=%s,%n  imageBackPath=%s,%n}",
                this.id,
                this.store,
                this.note,
@@ -188,19 +636,14 @@ public class LoyaltyCard implements Parcelable {
                this.starStatus,
                this.lastUsed,
                this.zoomLevel,
-                this.archiveStatus
+                this.zoomLevelWidth,
+                this.archiveStatus,
+                this.imageThumbnail,
+                this.imageThumbnailPath,
+                this.imageFront,
+                this.imageFrontPath,
+                this.imageBack,
+                this.imageBackPath
        );
    }
-
-    public static final Creator<LoyaltyCard> CREATOR = new Creator<LoyaltyCard>() {
-        @Override
-        public LoyaltyCard createFromParcel(Parcel in) {
-            return new LoyaltyCard(in);
-        }
-
-        @Override
-        public LoyaltyCard[] newArray(int size) {
-            return new LoyaltyCard[size];
-        }
-    };
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -30,6 +30,7 @@ import java.text.DateFormat;
 import java.util.ArrayList;

 import protect.card_locker.databinding.LoyaltyCardLayoutBinding;
+import protect.card_locker.preferences.Settings;

 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
    private int mCurrentSelectedIndex = -1;
@@ -79,7 +80,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    public LoyaltyCard getCard(int position) {
        mCursor.moveToPosition(position);
-        return LoyaltyCard.toLoyaltyCard(mCursor);
+        return LoyaltyCard.fromCursor(mContext, mCursor);
    }

    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
@@ -87,8 +88,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        boolean showDivider = false;
        inputHolder.mDivider.setVisibility(View.GONE);

-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
-        Bitmap icon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
+        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(mContext, inputCursor);
+        Bitmap icon = loyaltyCard.getImageThumbnail(mContext);

        if (mLoyaltyCardListDisplayOptions.showingNameBelowThumbnail() && icon != null) {
            showDivider = true;
@@ -111,21 +112,21 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        }

        if (mLoyaltyCardListDisplayOptions.showingValidity() && loyaltyCard.validFrom != null) {
-            inputHolder.setExtraField(inputHolder.mValidFromField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.validFrom), Utils.isNotYetValid(loyaltyCard.validFrom) ? Color.RED : null, showDivider);
+            inputHolder.setExtraField(inputHolder.mValidFromField, DateFormat.getDateInstance(DateFormat.MEDIUM).format(loyaltyCard.validFrom), Utils.isNotYetValid(loyaltyCard.validFrom) ? Color.RED : null, showDivider);
        } else {
            inputHolder.setExtraField(inputHolder.mValidFromField, null, null, false);
        }

        if (mLoyaltyCardListDisplayOptions.showingValidity() && loyaltyCard.expiry != null) {
-            inputHolder.setExtraField(inputHolder.mExpiryField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry), Utils.hasExpired(loyaltyCard.expiry) ? Color.RED : null, showDivider);
+            inputHolder.setExtraField(inputHolder.mExpiryField, DateFormat.getDateInstance(DateFormat.MEDIUM).format(loyaltyCard.expiry), Utils.hasExpired(loyaltyCard.expiry) ? Color.RED : null, showDivider);
        } else {
            inputHolder.setExtraField(inputHolder.mExpiryField, null, null, false);
        }

        inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
-        inputHolder.mIconBackgroundColor = Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
+        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText, new Settings(mContext).getPreferredColumnCount());

-        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
+        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0);

        inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
        applyIconAnimation(inputHolder, inputCursor.getPosition());
@@ -192,7 +193,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        int i;
        for (i = 0; i < mSelectedItems.size(); i++) {
            mCursor.moveToPosition(mSelectedItems.keyAt(i));
-            result.add(LoyaltyCard.toLoyaltyCard(mCursor));
+            result.add(LoyaltyCard.fromCursor(mContext, mCursor));
        }

        return result;
@@ -211,13 +212,11 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {

        public TextView mCardText, mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
-        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
+        public ImageView mCardIcon, mTickIcon;
        public MaterialCardView mRow;
        public ConstraintLayout mStar, mArchived;
        public View mDivider;

-        private int mIconBackgroundColor;
-
        protected LoyaltyCardListItemViewHolder(LoyaltyCardLayoutBinding loyaltyCardLayoutBinding, CardAdapterListener inputListener) {
            super(loyaltyCardLayoutBinding.getRoot());
            View inputView = loyaltyCardLayoutBinding.getRoot();
@@ -231,10 +230,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            mCardIcon = loyaltyCardLayoutBinding.thumbnail;
            mCardText = loyaltyCardLayoutBinding.thumbnailText;
            mStar = loyaltyCardLayoutBinding.star;
-            mStarBackground = loyaltyCardLayoutBinding.starBackground;
-            mStarBorder = loyaltyCardLayoutBinding.starBorder;
            mArchived = loyaltyCardLayoutBinding.archivedIcon;
-            mArchivedBackground = loyaltyCardLayoutBinding.archiveBackground;
            mTickIcon = loyaltyCardLayoutBinding.selectedThumbnail;
            inputView.setOnLongClickListener(view -> {
                inputListener.onRowClicked(getAdapterPosition());
@@ -296,31 +292,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            mNoteField.requestLayout();
        }

-        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive, boolean colorByTheme) {
-            /* the below code does not work in android 5! hence the change of drawable instead
-            boolean needDarkForeground = Utils.needsDarkForeground(mIconBackgroundColor);
-            Drawable borderDrawable = mStarBorder.getDrawable().mutate();
-            Drawable backgroundDrawable = mStarBackground.getDrawable().mutate();
-            DrawableCompat.setTint(borderDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
-            DrawableCompat.setTint(backgroundDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
-            mStarBorder.setImageDrawable(borderDrawable);
-            mStarBackground.setImageDrawable(backgroundDrawable);
-            */
-            boolean dark = Utils.needsDarkForeground(mIconBackgroundColor);
-            if (colorByTheme) {
-                dark = !mDarkModeEnabled;
-            }
-
-            if (dark) {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
-                mStarBackground.setImageResource(R.drawable.ic_starred_black);
-                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24_black);
-            } else {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
-                mStarBackground.setImageResource(R.drawable.ic_starred_white);
-                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24);
-            }
-
+        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive) {
            if (enableStar) {
                mStar.setVisibility(View.VISIBLE);
            } else{
@@ -332,17 +304,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            } else{
                mArchived.setVisibility(View.GONE);
            }
-
-            mStarBorder.invalidate();
-            mStarBackground.invalidate();
-            mArchivedBackground.invalidate();
-
        }
    }
-
-    public int dpToPx(int dp, Context mContext) {
-        Resources r = mContext.getResources();
-        int px = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
-        return px;
-    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -19,6 +19,7 @@ import android.text.method.DigitsKeyListener;
 import android.text.style.ForegroundColorSpan;
 import android.text.util.Linkify;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -51,6 +52,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;
+import com.google.zxing.BarcodeFormat;

 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -97,9 +99,35 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    static final String STATE_IMAGEINDEX = "imageIndex";
    static final String STATE_FULLSCREEN = "isFullscreen";

+    static final String BUNDLE_ID = "id";
+    static final String BUNDLE_CARDLIST = "cardList";
+    static final String BUNDLE_TRANSITION_RIGHT = "transition_right";
+
    final private TaskHandler mTasks = new TaskHandler();
    Runnable barcodeImageGenerationFinishedCallback;

+    private long initTime = System.currentTimeMillis();
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (settings.useVolumeKeysForNavigation()) {
+            if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+                // Navigate to the previous card
+                if (initTime < (System.currentTimeMillis() - 1000)) {
+                    prevNextCard(false);
+                }
+                return true;
+            } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+                // Navigate to the next card
+                if (initTime < (System.currentTimeMillis() - 1000)) {
+                    prevNextCard(true);
+                }
+                return true;
+            }
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
    public void onMainImageTap() {
        // If we're in fullscreen, leave fullscreen
        if (isFullscreen) {
@@ -112,6 +140,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        // If the barcode is shown, switch to fullscreen layout
        if (imageType == ImageType.BARCODE) {
            setFullscreen(true);
+
            return;
        }

@@ -181,8 +210,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

    private void extractIntentFields(Intent intent) {
        final Bundle b = intent.getExtras();
-        loyaltyCardId = b != null ? b.getInt("id") : 0;
-        cardList = b != null ? b.getIntegerArrayList("cardList") : null;
+        loyaltyCardId = b != null ? b.getInt(BUNDLE_ID) : 0;
+        cardList = b != null ? b.getIntegerArrayList(BUNDLE_CARDLIST) : null;
        Log.d(TAG, "View activity: id=" + loyaltyCardId);
    }

@@ -194,7 +223,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        } else {
            binding.scalerGuideline.setGuidelinePercent(0.5f * scale);
        }
+    }

+    private void setScalerWidthGuideline(int zoomLevelWidth) {
+        float halfscale = zoomLevelWidth / 200f;
+
+        binding.scalerEndwidthguideline.setGuidelinePercent(0.5f + halfscale);
+        binding.scalerStartwidthguideline.setGuidelinePercent(0.5f - halfscale);
    }

    @Override
@@ -208,7 +243,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                return;
            }

-            int transitionRight = incomingIntentExtras.getInt("transition_right", -1);
+            int transitionRight = incomingIntentExtras.getInt(BUNDLE_TRANSITION_RIGHT, -1);
            if (transitionRight == 1) {
                // right side transition
                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
@@ -221,6 +256,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        super.onCreate(savedInstanceState);
        binding = LoyaltyCardViewLayoutBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
        Toolbar toolbar = binding.toolbar;
        setSupportActionBar(toolbar);

@@ -251,36 +287,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        database = new DBHelper(this).getWritableDatabase();
        importURIHelper = new ImportURIHelper(this);

-        binding.barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                if (!fromUser) {
-                    Log.d(TAG, "non user triggered onProgressChanged, ignoring, progress is " + progress);
-                    return;
-                }
-                Log.d(TAG, "Progress is " + progress);
-                Log.d(TAG, "Max is " + binding.barcodeScaler.getMax());
-                float scale = (float) progress / (float) binding.barcodeScaler.getMax();
-                Log.d(TAG, "Scaling to " + scale);
-
-                loyaltyCard.zoomLevel = progress;
-                DBHelper.updateLoyaltyCardZoomLevel(database, loyaltyCardId, loyaltyCard.zoomLevel);
-
-                setScalerGuideline(loyaltyCard.zoomLevel);
-
-                drawMainImage(mainImageIndex, true, isFullscreen);
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-
-            }
-        });
+        binding.barcodeScaler.setOnSeekBarChangeListener(setOnSeekBarChangeListenerUnifiedFunction());
+        binding.barcodeWidthscaler.setOnSeekBarChangeListener(setOnSeekBarChangeListenerUnifiedFunction());

        rotationEnabled = true;

@@ -302,7 +310,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());

        binding.iconContainer.setOnClickListener(view -> {
-            if (Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon) != null) {
+            if (loyaltyCard.getImageThumbnail(this) != null) {
                openImageInGallery(ImageType.ICON);
            } else {
                Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show();
@@ -342,6 +350,46 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        });
    }

+    private SeekBar.OnSeekBarChangeListener setOnSeekBarChangeListenerUnifiedFunction() {
+        return new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                if (!fromUser) {
+                    Log.d(TAG, "non user triggered onProgressChanged, ignoring, progress is " + progress);
+                    return;
+                }
+                Log.d(TAG, "Progress is " + progress);
+                if (seekBar.getId() == binding.barcodeScaler.getId()) {
+                    Log.d(TAG, "Max is " + binding.barcodeScaler.getMax());
+                    float scale = (float) progress / (float) binding.barcodeScaler.getMax();
+                    Log.d(TAG, "Scaling to " + scale);
+                }
+                else {
+                    Log.d(TAG, "Max is " + binding.barcodeWidthscaler.getMax());
+                    float scale = (float) progress / (float) binding.barcodeWidthscaler.getMax();
+                    Log.d(TAG, "Scaling to " + scale);
+                }
+                if (seekBar.getId() == binding.barcodeScaler.getId()) {
+                    loyaltyCard.zoomLevel = progress;
+                    setScalerGuideline(loyaltyCard.zoomLevel);
+                }
+                else {
+                    loyaltyCard.zoomLevelWidth = progress;
+                    setScalerWidthGuideline(loyaltyCard.zoomLevelWidth);
+                }
+
+                DBHelper.updateLoyaltyCardZoomLevel(database, loyaltyCardId, loyaltyCard.zoomLevel, loyaltyCard.zoomLevelWidth);
+                drawMainImage(mainImageIndex, true, isFullscreen);
+            }
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+            }
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+            }
+        };
+    }
+
    private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
        if (spannableStringBuilder.length() > 0) {
            spannableStringBuilder.append("\n\n");
@@ -572,8 +620,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        // Restart activity with new card id and index
        Intent intent = getIntent();
        Bundle b = intent.getExtras();
-        b.putInt("id", loyaltyCardId);
-        b.putInt("transition_right", transitionRight ? 1 : 0);
+        b.putInt(BUNDLE_ID, loyaltyCardId);
+        b.putInt(BUNDLE_TRANSITION_RIGHT, transitionRight ? 1 : 0);
        intent.putExtras(b);
        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
        startActivity(intent);
@@ -633,7 +681,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            window.setAttributes(attributes);
        }

-        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
+        loyaltyCard = DBHelper.getLoyaltyCard(this, database, loyaltyCardId);
        if (loyaltyCard == null) {
            Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
            Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
@@ -680,6 +728,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
        binding.barcodeScaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
        binding.barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
+        binding.barcodeWidthscaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
+        binding.barcodeWidthscaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));

        // Set bottomAppBar and system navigation bar color
        binding.bottomAppBar.setBackgroundColor(darkenedColor);
@@ -692,8 +742,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        editButtonIcon.setTint(Utils.needsDarkForeground(complementaryColor) ? Color.BLACK : Color.WHITE);
        binding.fabEdit.setImageDrawable(editButtonIcon);

-        Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
-        Utils.setIconOrTextWithBackground(this, loyaltyCard, icon, binding.iconImage, binding.iconText);
+        Bitmap icon = loyaltyCard.getImageThumbnail(this);
+        Utils.setIconOrTextWithBackground(this, loyaltyCard, icon, binding.iconImage, binding.iconText, 1);

        // If the background is very bright, we should use dark icons
        backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
@@ -721,12 +771,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            imageTypes.add(ImageType.BARCODE);
        }

-        frontImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.front);
+        frontImageBitmap = loyaltyCard.getImageFront(this);
        if (frontImageBitmap != null) {
            imageTypes.add(ImageType.IMAGE_FRONT);
        }

-        backImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.back);
+        backImageBitmap = loyaltyCard.getImageBack(this);
        if (backImageBitmap != null) {
            imageTypes.add(ImageType.IMAGE_BACK);
        }
@@ -830,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();
@@ -840,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();
@@ -865,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();
@@ -908,7 +962,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                    null,
                    false,
                    this,
-                    addPadding);
+                    addPadding,
+                    isFullscreen);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
@@ -1102,11 +1157,18 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            binding.container.setVisibility(View.GONE);
            binding.fullscreenLayout.setVisibility(View.VISIBLE);

+            // Only show width slider if the barcode isn't square (square barcodes will resize height and width together)
+            // or if the internals of the barcode are squares, like DATA_MATRIX
+            binding.setWidthLayout.setVisibility((format.isSquare() || format.format() == BarcodeFormat.DATA_MATRIX) ? View.GONE : View.VISIBLE);
+
            drawMainImage(mainImageIndex, true, isFullscreen);

            binding.barcodeScaler.setProgress(loyaltyCard.zoomLevel);
            setScalerGuideline(loyaltyCard.zoomLevel);

+            binding.barcodeWidthscaler.setProgress(loyaltyCard.zoomLevelWidth);
+            setScalerWidthGuideline(loyaltyCard.zoomLevelWidth);
+
            // Hide actionbar
            if (actionBar != null) {
                actionBar.hide();
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -2,11 +2,15 @@ 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;
 import android.database.CursorIndexOutOfBoundsException;
 import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -21,16 +25,19 @@ import android.widget.Toast;
 import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.splashscreen.SplashScreen;
+import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;

+import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,6 +48,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import protect.card_locker.databinding.ContentMainBinding;
 import protect.card_locker.databinding.MainActivityBinding;
 import protect.card_locker.databinding.SortingOptionBinding;
+import protect.card_locker.preferences.Settings;
 import protect.card_locker.preferences.SettingsActivity;

 public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
@@ -50,6 +58,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    public static final String RESTART_ACTIVITY_INTENT = "restart_activity_intent";

    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
+    static final String STATE_SEARCH_QUERY = "SEARCH_QUERY";

    private SQLiteDatabase mDatabase;
    private LoyaltyCardCursorAdapter mAdapter;
@@ -57,6 +66,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    private SearchView mSearchView;
    private int mLoyaltyCardCount = 0;
    protected String mFilter = "";
+    private String currentQuery = "";
+    private String finalQuery = "";
    protected Object mGroup = null;
    protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
    protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
@@ -66,9 +77,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    private View mNoMatchingCardsText;
    private View mNoGroupCardsText;
    private TabLayout groupsTabLayout;
-
    private Runnable mUpdateLoyaltyCardListRunnable;
-
    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
    private ActivityResultLauncher<Intent> mSettingsLauncher;

@@ -196,11 +205,33 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        SplashScreen.installSplashScreen(this);
        super.onCreate(inputSavedInstanceState);

+        // Delete old cache files
+        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
+        new Thread(() -> {
+            long twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24);
+
+            File[] tempFiles = getCacheDir().listFiles();
+
+            if (tempFiles == null) {
+                Log.e(TAG, "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup...");
+                return;
+            }
+
+            for (File file : tempFiles) {
+                if (file.lastModified() < twentyFourHoursAgo) {
+                    if (!file.delete()) {
+                        Log.w(TAG, "Failed to delete cache file " + file.getPath());
+                    }
+                };
+            }
+        }).start();
+
        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
        extractIntentFields(getIntent());

        binding = MainActivityBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
        setSupportActionBar(binding.toolbar);
        groupsTabLayout = binding.groups;
        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
@@ -247,52 +278,15 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        mCardList.setAdapter(mAdapter);
        registerForContextMenu(mCardList);

-        mGroup = null;
-        updateLoyaltyCardList(true);
-
-        /*
-         * This was added for Huawei, but Huawei is just too much of a fucking pain.
-         * Just leaving this commented out if needed for the future idk
-         * https://twitter.com/SylvieLorxu/status/1379437902741012483
-         *
-
-        // Show privacy policy on first run
-        SharedPreferences privacyPolicyShownPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_privacy_policy_shown),
-                Context.MODE_PRIVATE);
-
-
-        if (privacyPolicyShownPref.getInt(getString(R.string.sharedpreference_privacy_policy_shown), 0) == 0) {
-            SharedPreferences.Editor privacyPolicyShownPrefEditor = privacyPolicyShownPref.edit();
-            privacyPolicyShownPrefEditor.putInt(getString(R.string.sharedpreference_privacy_policy_shown), 1);
-            privacyPolicyShownPrefEditor.apply();
-
-            new AlertDialog.Builder(this)
-                    .setTitle(R.string.privacy_policy)
-                    .setMessage(R.string.privacy_policy_popup_text)
-                    .setPositiveButton(R.string.accept, null)
-                    .setNegativeButton(R.string.privacy_policy, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                            openPrivacyPolicy();
-                        }
-                    })
-                    .setIcon(android.R.drawable.ic_dialog_info)
-                    .show();
-        }
-         */
-
        mBarcodeScannerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
            // Exit early if the user cancelled the scan (pressed back/home)
            if (result.getResultCode() != RESULT_OK) {
                return;
            }

-            Intent intent = result.getData();
-            List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
-
-            Bundle inputBundle = intent.getExtras();
-            String group = inputBundle != null ? inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
-            processBarcodeValuesList(barcodeValuesList, group, false);
+            Intent editIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            editIntent.putExtras(result.getData().getExtras());
+            startActivity(editIntent);
        });

        mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
@@ -328,7 +322,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        if (mSearchView != null && !mSearchView.isIconified()) {
            mFilter = mSearchView.getQuery().toString();
        }
-
        // Start of active tab logic
        updateTabGroups(groupsTabLayout);

@@ -339,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;

@@ -386,6 +365,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            mBarcodeScannerLauncher.launch(intent);
        });
        addButton.bringToFront();
+
+        var layoutManager = (GridLayoutManager) mCardList.getLayoutManager();
+        if (layoutManager != null) {
+            var settings = new Settings(this);
+            layoutManager.setSpanCount(settings.getPreferredColumnCount());
+        }
    }

    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
@@ -445,25 +430,25 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        if (mCurrentActionMode != null) {
            mCurrentActionMode.finish();
        }
+
+        new ListWidget().updateAll(mAdapter.mContext);
    }

-    private void processBarcodeValuesList(List<BarcodeValues> barcodeValuesList, String group, boolean closeAppOnNoBarcode) {
-        if (barcodeValuesList.isEmpty()) {
-            throw new IllegalArgumentException("barcodesValues may not be empty");
+    private void processParseResultList(List<ParseResult> parseResultList, String group, boolean closeAppOnNoBarcode) {
+        if (parseResultList.isEmpty()) {
+            throw new IllegalArgumentException("parseResultList may not be empty");
        }

-        Utils.makeUserChooseBarcodeFromList(MainActivity.this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+        Utils.makeUserChooseParseResultFromList(MainActivity.this, parseResultList, new ParseResultListDisambiguatorCallback() {
            @Override
-            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
-                Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle newBundle = new Bundle();
-                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
-                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
+            public void onUserChoseParseResult(ParseResult parseResult) {
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = parseResult.toLoyaltyCardBundle(MainActivity.this);
                if (group != null) {
-                    newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
+                    bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
                }
-                newIntent.putExtras(newBundle);
-                startActivity(newIntent);
+                intent.putExtras(bundle);
+                startActivity(intent);
            }

            @Override
@@ -479,28 +464,53 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        String receivedAction = intent.getAction();
        String receivedType = intent.getType();

-        // Check if an image or file was shared to us
-        if (Intent.ACTION_SEND.equals(receivedAction)) {
-            List<BarcodeValues> barcodeValuesList;
+        if (receivedAction == null || receivedType == null) {
+            return;
+        }

-            if (receivedType.equals("text/plain")) {
-                barcodeValuesList = Collections.singletonList(new BarcodeValues(null, intent.getStringExtra(Intent.EXTRA_TEXT)));
-            } else if (receivedType.startsWith("image/")) {
-                barcodeValuesList = Utils.retrieveBarcodesFromImage(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+        List<ParseResult> parseResultList;
+
+        // Check for shared text
+        if (receivedAction.equals(Intent.ACTION_SEND) && receivedType.equals("text/plain")) {
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT));
+            parseResultList = Collections.singletonList(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
+        } else {
+            // Parse whatever file was sent, regardless of opening or sharing
+            Uri data;
+            if (receivedAction.equals(Intent.ACTION_VIEW)) {
+                data = intent.getData();
+            } else if (receivedAction.equals(Intent.ACTION_SEND)) {
+                data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+            } else {
+                Log.e(TAG, "Wrong action type to parse intent");
+                return;
+            }
+
+            if (receivedType.startsWith("image/")) {
+                parseResultList = Utils.retrieveBarcodesFromImage(this, data);
            } else if (receivedType.equals("application/pdf")) {
-                barcodeValuesList = Utils.retrieveBarcodesFromPdf(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+                parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
+            } else if (Arrays.asList("application/vnd.apple.pkpass", "application/vnd-com.apple.pkpass").contains(receivedType)) {
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
+            } else if (receivedType.equals("application/vnd.espass-espass")) {
+                // FIXME: espass is not pkpass
+                // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
+                // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
            } else {
                Log.e(TAG, "Wrong mime-type");
                return;
            }
-
-            if (barcodeValuesList.isEmpty()) {
-                finish();
-                return;
-            }
-
-            processBarcodeValuesList(barcodeValuesList, null, true);
        }
+
+        // Give up if we should parse but there is nothing to parse
+        if (parseResultList == null || parseResultList.isEmpty()) {
+            finish();
+            return;
+        }
+
+        processParseResultList(parseResultList, null, true);
    }

    private void extractIntentFields(Intent intent) {
@@ -534,6 +544,24 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

    }

+    @Override
+    // Saving currentQuery to finalQuery for user, this will be used to restore search history, happens when user clicks a card from list
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        finalQuery = currentQuery;
+        // Putting the query also into outState for later use in onRestoreInstanceState when rotating screen
+        if (mSearchView != null) {
+            outState.putString(STATE_SEARCH_QUERY, finalQuery);
+        }
+    }
+
+    @Override
+    // Restoring instance state when rotation of screen happens with the goal to restore search query for user
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        finalQuery = savedInstanceState.getString(STATE_SEARCH_QUERY, "");
+    }
+
    @Override
    public boolean onCreateOptionsMenu(Menu inputMenu) {
        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
@@ -542,15 +570,42 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
        if (searchManager != null) {
-            mSearchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
+            MenuItem searchMenuItem = inputMenu.findItem(R.id.action_search);
+            mSearchView = (SearchView) searchMenuItem.getActionView();
            mSearchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
            mSearchView.setSubmitButtonEnabled(false);
-
            mSearchView.setOnCloseListener(() -> {
                invalidateOptionsMenu();
                return false;
            });

+            /*
+             * On Android 13 and later, pressing Back while the search view is open hides the keyboard
+             * and collapses the search view at the same time.
+             * This brings back the old behavior on Android 12 and lower: pressing Back once
+             * hides the keyboard, press again while keyboard is hidden to collapse the search view.
+             */
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                searchMenuItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
+                    @Override
+                    public boolean onMenuItemActionExpand(@NonNull MenuItem item) {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean onMenuItemActionCollapse(@NonNull MenuItem item) {
+                        if (mSearchView.hasFocus()) {
+                            mSearchView.clearFocus();
+                            return false;
+                        }
+                        currentQuery = "";
+                        mFilter = "";
+                        updateLoyaltyCardList(false);
+                        return true;
+                    }
+                });
+            }
+
            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                @Override
                public boolean onQueryTextSubmit(String query) {
@@ -560,7 +615,21 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                @Override
                public boolean onQueryTextChange(String newText) {
                    mFilter = newText;
-
+                    // New logic to ensure search history after coming back from picked card - user will see the last search query
+                    if (newText.isEmpty()) {
+                        if(!finalQuery.isEmpty()){
+                            // Setting the query text for user after coming back from picked card from finalQuery
+                            mSearchView.setQuery(finalQuery, false);
+                        }
+                        else if(!currentQuery.isEmpty()){
+                            // Else if is needed in case user deletes search - expected behaviour is to show all cards
+                            currentQuery = "";
+                            mSearchView.setQuery(currentQuery, false);
+                        }
+                    } else {
+                        // Setting search query each time user changes the text in search to temporary variable to be used later in finalQuery String which will be used to restore search history
+                        currentQuery = newText;
+                    }
                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
                    mGroup = currentTab != null ? currentTab.getTag() : null;

@@ -569,6 +638,14 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                    return true;
                }
            });
+            // Check if we came from a picked card back to search, in that case we want to show the search view with previous search query
+            if(!finalQuery.isEmpty()){
+                // Expand the search view to show the query
+                searchMenuItem.expandActionView();
+                // Setting the query text to empty String due to behaviour of onQueryTextChange after coming back from picked card - onQueryTextChange is called automatically without users interaction
+                finalQuery = "";
+                mSearchView.setQuery(currentQuery, false);
+            }
        }

        return super.onCreateOptionsMenu(inputMenu);
@@ -622,6 +699,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                        showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
                );

+                new ListWidget().updateAll(this);
+
                dialog.dismiss();
            });

@@ -785,14 +864,14 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
            intent.setAction("");
            final Bundle b = new Bundle();
-            b.putInt("id", loyaltyCard.id);
+            b.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);

            ArrayList<Integer> cardList = new ArrayList<>();
            for (int i = 0; i < mAdapter.getItemCount(); i++) {
                cardList.add(mAdapter.getCard(i).id);
            }

-            b.putIntegerArrayList("cardList", cardList);
+            b.putIntegerArrayList(LoyaltyCardViewActivity.BUNDLE_CARDLIST, cardList);
            intent.putExtras(b);

            startActivity(intent);
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.java
@@ -48,6 +48,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
        super.onCreate(inputSavedInstanceState);
        binding = ActivityManageGroupBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());
+        Utils.applyWindowInsetsAndFabOffset(binding.getRoot(), binding.fabSave);
        Toolbar toolbar = binding.toolbar;
        setSupportActionBar(toolbar);

--- a/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
@@ -33,7 +33,7 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {

    @Override
    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
+        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(mContext, inputCursor);
        Boolean overlayValue = mInGroupOverlay.get(loyaltyCard.id);
        if ((overlayValue != null ? overlayValue : isLoyaltyCardInGroup(loyaltyCard.id))) {
            mAnimationItemsIndex.put(inputCursor.getPosition(), true);
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -42,6 +42,7 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
        binding = ManageGroupsActivityBinding.inflate(getLayoutInflater());
        setTitle(R.string.groups);
        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
        Toolbar toolbar = binding.toolbar;
        setSupportActionBar(toolbar);
        enableToolbarBackButton();
--- a/app/src/main/java/protect/card_locker/ParseResult.kt
+++ b/app/src/main/java/protect/card_locker/ParseResult.kt
@@ -0,0 +1,31 @@
+package protect.card_locker
+
+import android.content.Context
+import android.os.Bundle
+
+class ParseResult(
+    val parseResultType: ParseResultType,
+    val loyaltyCard: LoyaltyCard) {
+    var note: String? = null
+
+    fun toLoyaltyCardBundle(context: Context): Bundle {
+        when (parseResultType) {
+            ParseResultType.FULL -> return loyaltyCard.toBundle(context, listOf())
+            ParseResultType.BARCODE_ONLY -> {
+                val defaultLoyaltyCard = LoyaltyCard()
+                defaultLoyaltyCard.setBarcodeId(null)
+                defaultLoyaltyCard.setBarcodeType(loyaltyCard.barcodeType)
+                defaultLoyaltyCard.setCardId(loyaltyCard.cardId)
+
+                return defaultLoyaltyCard.toBundle(
+                    context,
+                    listOf(
+                        LoyaltyCard.BUNDLE_LOYALTY_CARD_BARCODE_ID,
+                        LoyaltyCard.BUNDLE_LOYALTY_CARD_BARCODE_TYPE,
+                        LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID
+                    )
+                )
+            }
+        }
+    }
+}
--- a/app/src/main/java/protect/card_locker/ParseResultListDisambiguatorCallback.java
+++ b/app/src/main/java/protect/card_locker/ParseResultListDisambiguatorCallback.java
@@ -0,0 +1,6 @@
+package protect.card_locker;
+
+public interface ParseResultListDisambiguatorCallback {
+    void onUserChoseParseResult(ParseResult parseResult);
+    void onUserDismissedSelector();
+}
--- a/app/src/main/java/protect/card_locker/ParseResultType.kt
+++ b/app/src/main/java/protect/card_locker/ParseResultType.kt
@@ -0,0 +1,6 @@
+package protect.card_locker
+
+enum class ParseResultType {
+    FULL,
+    BARCODE_ONLY
+}
--- a/app/src/main/java/protect/card_locker/PkpassParser.kt
+++ b/app/src/main/java/protect/card_locker/PkpassParser.kt
@@ -0,0 +1,443 @@
+package protect.card_locker
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.net.Uri
+import android.util.ArrayMap
+import android.util.Log
+import com.google.zxing.BarcodeFormat
+import net.lingala.zip4j.io.inputstream.ZipInputStream
+import net.lingala.zip4j.model.LocalFileHeader
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.math.BigDecimal
+import java.text.DateFormat
+import java.text.ParseException
+import java.time.ZonedDateTime
+import java.time.format.DateTimeParseException
+import java.util.Currency
+import java.util.Date
+
+class PkpassParser(context: Context, uri: Uri?) {
+    private var mContext = context
+
+    private var translations: ArrayMap<String, Map<String, String>> = ArrayMap()
+
+    private var passContent: JSONObject? = null
+
+    private var store: String? = null
+    private var note: String? = null
+    private var validFrom: Date? = null
+    private var expiry: Date? = null
+    private val balance: BigDecimal = BigDecimal(0)
+    private val balanceType: Currency? = null
+    // FIXME: Some cards may not have any barcodes, but Catima doesn't accept null card ID
+    // An empty string card ID would prevent a crash, but would be blocked in the edit activity
+    // Setting the default to the "No barcode" text at least prevents a crash, but it is definitely a hack
+    private var cardId: String = context.getString(R.string.noBarcode)
+    private var barcodeId: String? = null
+    private var barcodeType: CatimaBarcode? = null
+    private var headerColor: Int? = null
+    private val starStatus = 0
+    private val lastUsed: Long = 0
+    private val zoomLevel = DBHelper.DEFAULT_ZOOM_LEVEL
+    private val zoomLevelWidth = DBHelper.DEFAULT_ZOOM_LEVEL_WIDTH
+    private var archiveStatus = 0
+
+    var image: Bitmap? = null
+        private set
+    private var logoSize = 0
+
+    init {
+        if (passContent != null) {
+            throw IllegalStateException("Pkpass instance already initialized!")
+        }
+
+        mContext = context
+
+        Log.i(TAG, "Received Pkpass file")
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data")
+            throw IOException(context.getString(R.string.errorReadingFile))
+        }
+
+        try {
+            mContext.contentResolver.openInputStream(uri).use { inputStream ->
+                ZipInputStream(inputStream).use { zipInputStream ->
+                    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
+
+                        // We assume there are three options, as per spec:
+                        // language.lproj/pass.strings
+                        // file.extension
+                        // More directories are ignored
+                        val filenameParts = localFileHeader.fileName.split('/')
+                        if (filenameParts.size > 2) {
+                            continue
+                        } else if (filenameParts.size == 2) {
+                            // Doesn't seem like a language directory, ignore
+                            if (!filenameParts[0].endsWith(".lproj")) continue
+
+                            val locale = filenameParts[0].removeSuffix(".lproj")
+
+                            translations[locale] = parseLanguageStrings(ZipUtils.read(zipInputStream))
+                        }
+
+                        // Not a language, parse as normal files
+                        when (localFileHeader.fileName) {
+                            "logo.png" -> loadImageIfBiggerSize(1, zipInputStream)
+                            "logo@2x.png" -> loadImageIfBiggerSize(2, zipInputStream)
+                            "logo@3x.png" -> loadImageIfBiggerSize(3, zipInputStream)
+                            "pass.json" -> passContent = ZipUtils.readJSON(zipInputStream) // Parse this last, so we're sure we have all language info
+                        }
+                    }
+
+                    checkNotNull(passContent) { "File lacks pass.json" }
+                }
+            }
+        } catch (e: FileNotFoundException) {
+            throw IOException(mContext.getString(R.string.errorReadingFile))
+        } catch (e: Exception) {
+            throw e
+        }
+    }
+
+    fun listLocales(): List<String> {
+        return translations.keys.toList()
+    }
+
+    fun toLoyaltyCard(locale: String?): LoyaltyCard {
+        parsePassJSON(checkNotNull(passContent) { "Pkpass instance not yet initialized!" }, locale)
+
+        return LoyaltyCard(
+            -1,
+            store,
+            note,
+            validFrom,
+            expiry,
+            balance,
+            balanceType,
+            cardId,
+            barcodeId,
+            barcodeType,
+            headerColor,
+            starStatus,
+            lastUsed,
+            zoomLevel,
+            zoomLevelWidth,
+            archiveStatus,
+            image,
+            null,
+            null,
+            null,
+            null,
+            null
+        )
+    }
+
+    private fun getTranslation(string: String, locale: String?): String {
+        if (locale == null) {
+            return string
+        }
+
+        val localeStrings = translations[locale]
+
+        return localeStrings?.get(string) ?: string
+    }
+
+    private fun loadImageIfBiggerSize(fileLogoSize: Int, zipInputStream: ZipInputStream) {
+        if (logoSize < fileLogoSize) {
+            image = ZipUtils.readImage(zipInputStream)
+            logoSize = fileLogoSize
+        }
+    }
+
+    private fun parseColor(color: String): Int? {
+        // First, try formats supported by Android natively
+        try {
+            return Color.parseColor(color)
+        } catch (ignored: IllegalArgumentException) {}
+
+        // If that didn't work, try parsing it as a rbg(0,0,255) value
+        val red: Int;
+        val green: Int;
+        val blue: Int;
+
+        // Parse rgb(0,0,0) string
+        val rgbInfo = Regex("""^rgb\(\s*(?<red>\d+)\s*,\s*(?<green>\d+)\s*,\s*(?<blue>\d+)\s*\)$""").find(color)
+        if (rgbInfo == null) {
+            return null
+        }
+
+        // Convert to integers
+        try {
+            red = rgbInfo.groups[1]!!.value.toInt()
+            green = rgbInfo.groups[2]!!.value.toInt()
+            blue = rgbInfo.groups[3]!!.value.toInt()
+        } catch (e: NumberFormatException) {
+            return null
+        }
+
+        // Ensure everything is in a valid range as Color.rgb does not do range checks
+        if (red < 0 || red > 255) return null
+        if (green < 0 || green > 255) return null
+        if (blue < 0 || blue > 255) return null
+
+        return Color.rgb(red, green, blue)
+    }
+
+    private fun parseDateTime(dateTime: String): Date {
+        return Date.from(ZonedDateTime.parse(dateTime).toInstant())
+    }
+
+    private fun parseLanguageStrings(data: String): Map<String, String> {
+        val output = ArrayMap<String, String>()
+
+        // Translations look like this:
+        // "key_name" = "Translated value";
+        //
+        // However, "Translated value" may be multiple lines and may contain " (however, it'll be escaped)
+        var translationLine = StringBuilder()
+
+        for (line in data.lines()) {
+            translationLine.append(line)
+
+            // Make sure we don't have a false ending (this is the escaped double quote: \";)
+            if (!line.endsWith("\\\";") and line.endsWith("\";")) {
+                // We reached a translation ending, time to parse it
+
+                // 1. Split into key and value
+                // 2. Remove cruft of each
+                // 3. Clean up escape sequences
+                val keyValue = translationLine.toString().split("=", ignoreCase = false, limit = 2)
+                val key = keyValue[0].trim().removePrefix("\"").removeSuffix("\"")
+                val value = keyValue[1].trim().removePrefix("\"").removeSuffix("\";").replace("\\", "")
+
+                output[key] = value
+
+                translationLine = StringBuilder()
+            } else {
+                translationLine.append("\n")
+            }
+        }
+
+        return output
+    }
+
+    private fun parsePassJSON(jsonObject: JSONObject, locale: String?) {
+        if (jsonObject.getInt("formatVersion") != 1) {
+            throw IllegalArgumentException(mContext.getString(R.string.unsupportedFile))
+        }
+
+        // Prefer logoText for store, it's generally shorter
+        try {
+            store = jsonObject.getString("logoText")
+        } catch (ignored: JSONException) {}
+
+        if (store.isNullOrEmpty()) {
+            store = jsonObject.getString("organizationName")
+        }
+
+        val noteText = StringBuilder()
+        noteText.append(getTranslation(jsonObject.getString("description"), locale))
+
+        try {
+            validFrom = parseDateTime(jsonObject.getString("relevantDate"))
+        } catch (ignored: JSONException) {}
+
+        try {
+            expiry = parseDateTime(jsonObject.getString("expirationDate"))
+        } catch (ignored: JSONException) {}
+
+        try {
+            headerColor = parseColor(jsonObject.getString("backgroundColor"))
+        } catch (ignored: JSONException) {}
+
+        var pkPassHasBarcodes = false
+        var validBarcodeFound = false
+
+        // Create a list of possible barcodes
+        val barcodes = ArrayList<JSONObject>()
+
+        // Append the non-deprecated entries
+        try {
+            val foundInBarcodesField = jsonObject.getJSONArray("barcodes")
+
+            for (i in 0 until foundInBarcodesField.length()) {
+                barcodes.add(foundInBarcodesField.getJSONObject(i))
+            }
+        } catch (ignored: JSONException) {}
+
+        // Append the deprecated entry if it exists
+        try {
+            barcodes.add(jsonObject.getJSONObject("barcode"))
+        } catch (ignored: JSONException) {}
+
+        for (barcode in barcodes) {
+            pkPassHasBarcodes = true
+
+            try {
+                parsePassJSONBarcodeField(barcode)
+
+                validBarcodeFound = true
+                break
+            } catch (ignored: IllegalArgumentException) {}
+        }
+
+        if (pkPassHasBarcodes && !validBarcodeFound) {
+            throw FormatException(mContext.getString(R.string.errorReadingFile))
+        }
+
+        // An used card being "archived" probably is the most sensible way to map "voided"
+        archiveStatus = try {
+            if (jsonObject.getBoolean("voided")) 1 else 0
+        } catch (ignored: JSONException) {
+            0
+        }
+
+        // Append type-specific info to the pass
+
+        // Find the relevant pass type and parse it
+        for (passType in listOf("boardingPass", "coupon", "eventTicket", "generic")) {
+            try {
+                var extraText = parsePassJSONPassFields(
+                    jsonObject.getJSONObject(passType),
+                    locale
+                )
+
+                noteText.append("\n\n")
+                noteText.append(extraText)
+
+                break
+            } catch (ignored: JSONException) {}
+        }
+
+        note = noteText.toString()
+    }
+
+    /* Return success or failure */
+    private fun parsePassJSONBarcodeField(barcodeInfo: JSONObject) {
+        val format = barcodeInfo.getString("format")
+
+        // We only need to check these 4 formats as no other options are valid in the PkPass spec
+        barcodeType = when(format) {
+            "PKBarcodeFormatQR" -> CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE)
+            "PKBarcodeFormatPDF417" -> CatimaBarcode.fromBarcode(BarcodeFormat.PDF_417)
+            "PKBarcodeFormatAztec" -> CatimaBarcode.fromBarcode(BarcodeFormat.AZTEC)
+            "PKBarcodeFormatCode128" -> CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128)
+            else -> throw IllegalArgumentException("No valid barcode type")
+        }
+
+        // FIXME: We probably need to do something with the messageEncoding field
+        try {
+            cardId = barcodeInfo.getString("altText")
+            barcodeId = barcodeInfo.getString("message")
+        } catch (ignored: JSONException) {
+            cardId = barcodeInfo.getString("message")
+            barcodeId = null
+        }
+
+        // Don't set barcodeId if it's the same as cardId
+        if (cardId == barcodeId) {
+            barcodeId = null
+        }
+    }
+
+    private fun parsePassJSONPassFields(fieldsParent: JSONObject, locale: String?): String {
+        // These fields contain a lot of info on where we're supposed to display them, but Catima doesn't really have anything for that
+        // So for now, throw them all into the description field in a logical order
+        val noteContents: MutableList<String> = ArrayList()
+
+        // Collect all the groups of fields that exist
+        for (fieldType in listOf("headerFields", "primaryFields", "secondaryFields", "auxiliaryFields", "backFields")) {
+            val content = StringBuilder()
+
+            try {
+                val fieldArray = fieldsParent.getJSONArray(fieldType)
+                for (i in 0 until fieldArray.length()) {
+                    val entry = fieldArray.getJSONObject(i)
+
+                    content.append(parsePassJSONPassField(entry, locale))
+
+                    // If this is not the last part, add spacing on the end
+                    if (i < (fieldArray.length() - 1)) {
+                        content.append("\n")
+                    }
+                }
+            } catch (ignore: JSONException) {
+            } catch (ignore: ParseException) {
+            }
+
+            if (content.isNotEmpty()) {
+                noteContents.add(content.toString())
+            }
+        }
+
+        // Merge all field groups together, one paragraph for field group
+        val output = StringBuilder()
+
+        for (i in 0 until noteContents.size) {
+            output.append(noteContents[i])
+
+            // If this is not the last part, add newlines to separate
+            if (i < (noteContents.size - 1)) {
+                output.append("\n\n")
+            }
+        }
+
+        return output.toString()
+    }
+
+    private fun parsePassJSONPassField(field: JSONObject, locale: String?): String {
+        // Value may be a localizable string, a date or a number. So let's try to parse it as a date first
+
+        var value = getTranslation(field.getString("value"), locale)
+        try {
+            value = DateFormat.getDateTimeInstance().format(parseDateTime(value))
+        } catch (ignored: DateTimeParseException) {
+            // It's fine if it's not a date
+        }
+
+        // FIXME: Use the Android thing for formatted strings here
+        if (field.has("currencyCode")) {
+            val valueCurrency = Currency.getInstance(field.getString("currencyCode"))
+
+            value = Utils.formatBalance(
+                mContext,
+                Utils.parseBalance(value, valueCurrency),
+                valueCurrency
+            )
+        } else if (field.has("numberStyle")) {
+            if (field.getString("numberStyle") == "PKNumberStylePercent") {
+                // FIXME: Android formatting string
+                value = "${value}%"
+            }
+        }
+
+        val label = getTranslation(field.getString("label"), locale)
+
+        if (label.isNotEmpty()) {
+            return "$label: $value"
+        }
+
+        return value
+    }
+
+    companion object {
+        private const val TAG = "Catima"
+    }
+}
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -24,6 +24,8 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.ListAdapter;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toast;

@@ -35,6 +37,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.zxing.DecodeHintType;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.Intents;
 import com.journeyapps.barcodescanner.BarcodeCallback;
@@ -42,6 +45,8 @@ import com.journeyapps.barcodescanner.BarcodeResult;
 import com.journeyapps.barcodescanner.CaptureManager;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;

+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;

 import protect.card_locker.databinding.CustomBarcodeScannerBinding;
@@ -63,6 +68,7 @@ public class ScanActivity extends CatimaAppCompatActivity {

    private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
    private static final int PERMISSION_SCAN_ADD_FROM_PDF = 101;
+    private static final int PERMISSION_SCAN_ADD_FROM_PKPASS = 102;

    private CaptureManager capture;
    private DecoratedBarcodeView barcodeScannerView;
@@ -75,6 +81,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
    private ActivityResultLauncher<Intent> photoPickerLauncher;
    private ActivityResultLauncher<Intent> pdfPickerLauncher;
+    private ActivityResultLauncher<Intent> pkpassPickerLauncher;

    static final String STATE_SCANNER_ACTIVE = "scannerActive";
    private boolean mScannerActive = true;
@@ -82,7 +89,7 @@ public class ScanActivity extends CatimaAppCompatActivity {

    private void extractIntentFields(Intent intent) {
        final Bundle b = intent.getExtras();
-        cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;
+        cardId = b != null ? b.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID) : null;
        addGroup = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
        Log.d(TAG, "Scan activity: id=" + cardId);
    }
@@ -94,6 +101,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
        customBarcodeScannerBinding = CustomBarcodeScannerBinding.bind(binding.zxingBarcodeScanner);
        setTitle(R.string.scanCardBarcode);
        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
        Toolbar toolbar = binding.toolbar;
        setSupportActionBar(toolbar);
        enableToolbarBackButton();
@@ -103,18 +111,46 @@ public class ScanActivity extends CatimaAppCompatActivity {
        manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
        photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
        pdfPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PDF_FILE, result.getResultCode(), result.getData()));
+        pkpassPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PKPASS_FILE, result.getResultCode(), result.getData()));
        customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
            setScannerActive(false);

+            ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+            String[] texts = new String[]{
+                getString(R.string.addWithoutBarcode),
+                getString(R.string.addManually),
+                getString(R.string.addFromImage),
+                getString(R.string.addFromPdfFile),
+                getString(R.string.addFromPkpass)
+            };
+            Object[] icons = new Object[]{
+                R.drawable.baseline_block_24,
+                R.drawable.ic_edit,
+                R.drawable.baseline_image_24,
+                R.drawable.baseline_picture_as_pdf_24,
+                R.drawable.local_activity_24px
+            };
+            String[] columns = new String[]{"text", "icon"};
+
+            for (int i = 0; i < texts.length; i++) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put(columns[0], texts[i]);
+                map.put(columns[1], icons[i]);
+                list.add(map);
+            }
+
+            ListAdapter adapter = new SimpleAdapter(
+                ScanActivity.this,
+                list,
+                R.layout.alertdialog_row_with_icon,
+                columns,
+                new int[]{R.id.textView, R.id.imageView}
+            );
+
            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
            builder.setTitle(getString(R.string.add_a_card_in_a_different_way));
-            builder.setItems(
-                    new CharSequence[]{
-                            getString(R.string.addWithoutBarcode),
-                            getString(R.string.addManually),
-                            getString(R.string.addFromImage),
-                            getString(R.string.addFromPdfFile)
-                    },
+            builder.setAdapter(
+                    adapter,
                    (dialogInterface, i) -> {
                        switch (i) {
                            case 0:
@@ -127,7 +163,10 @@ public class ScanActivity extends CatimaAppCompatActivity {
                                addFromImage();
                                break;
                            case 3:
-                                addFromPdfFile();
+                                addFromPdf();
+                                break;
+                            case 4:
+                                addFromPkPass();
                                break;
                            default:
                                throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
@@ -138,7 +177,13 @@ public class ScanActivity extends CatimaAppCompatActivity {
            builder.show();
        });

+        // Configure barcodeScanner
        barcodeScannerView = binding.zxingBarcodeScanner;
+        Intent barcodeScannerIntent = new Intent();
+        Bundle barcodeScannerIntentBundle = new Bundle();
+        barcodeScannerIntentBundle.putBoolean(DecodeHintType.ALSO_INVERTED.name(), Boolean.TRUE);
+        barcodeScannerIntent.putExtras(barcodeScannerIntentBundle);
+        barcodeScannerView.initializeFromIntent(barcodeScannerIntent);

        // Even though we do the actual decoding with the barcodeScannerView
        // CaptureManager needs to be running to show the camera and scanning bar
@@ -152,16 +197,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
        barcodeScannerView.decodeSingle(new BarcodeCallback() {
            @Override
            public void barcodeResult(BarcodeResult result) {
-                Intent scanResult = new Intent();
-                Bundle scanResultBundle = new Bundle();
-                scanResultBundle.putString(BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BARCODE_FORMAT, result.getBarcodeFormat().name());
-                if (addGroup != null) {
-                    scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
-                }
-                scanResult.putExtras(scanResultBundle);
-                ScanActivity.this.setResult(RESULT_OK, scanResult);
-                finish();
+                LoyaltyCard loyaltyCard = new LoyaltyCard();
+                loyaltyCard.setCardId(result.getText());
+                loyaltyCard.setBarcodeType(CatimaBarcode.fromBarcode(result.getBarcodeFormat()));
+
+                returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
            }

            @Override
@@ -265,33 +305,31 @@ public class ScanActivity extends CatimaAppCompatActivity {
        mScannerActive = isActive;
    }

-    private void returnResult(String barcodeContents, String barcodeFormat) {
-        Intent manualResult = new Intent();
-        Bundle manualResultBundle = new Bundle();
-        manualResultBundle.putString(BARCODE_CONTENTS, barcodeContents);
-        manualResultBundle.putString(BARCODE_FORMAT, barcodeFormat);
+    private void returnResult(ParseResult parseResult) {
+        Intent result = new Intent();
+        Bundle bundle = parseResult.toLoyaltyCardBundle(ScanActivity.this);
        if (addGroup != null) {
-            manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+            bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
        }
-        manualResult.putExtras(manualResultBundle);
-        ScanActivity.this.setResult(RESULT_OK, manualResult);
+        result.putExtras(bundle);
+        ScanActivity.this.setResult(RESULT_OK, result);
        finish();
    }

    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
        super.onActivityResult(requestCode, resultCode, intent);

-        List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        List<ParseResult> parseResultList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);

-        if (barcodeValuesList.isEmpty()) {
+        if (parseResultList.isEmpty()) {
            setScannerActive(true);
            return;
        }

-        Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+        Utils.makeUserChooseParseResultFromList(this, parseResultList, new ParseResultListDisambiguatorCallback() {
            @Override
-            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
-                returnResult(barcodeValues.content(), barcodeValues.format());
+            public void onUserChoseParseResult(ParseResult parseResult) {
+                returnResult(parseResult);
            }

            @Override
@@ -338,7 +376,9 @@ public class ScanActivity extends CatimaAppCompatActivity {

        // Buttons
        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            returnResult(input.getText().toString(), "");
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            loyaltyCard.setCardId(input.getText().toString());
+            returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
        });
        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
        AlertDialog dialog = builder.create();
@@ -373,7 +413,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
            if (cardId != null) {
                final Bundle b = new Bundle();
-                b.putString("initialCardId", cardId);
+                b.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID, cardId);
                i.putExtras(b);
            }
            manualAddLauncher.launch(i);
@@ -387,10 +427,14 @@ public class ScanActivity extends CatimaAppCompatActivity {
        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
    }

-    public void addFromPdfFile() {
+    public void addFromPdf() {
        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF);
    }

+    public void addFromPkPass() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PKPASS);
+    }
+
    private void addFromImageOrFileAfterPermission(String mimeType, ActivityResultLauncher<Intent> launcher, int chooserText, int errorMessage) {
        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
        photoPickerIntent.setType(mimeType);
@@ -480,12 +524,14 @@ public class ScanActivity extends CatimaAppCompatActivity {
            } else {
                showCameraPermissionMissingText();
            }
-        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
+        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF || requestCode == PERMISSION_SCAN_ADD_FROM_PKPASS) {
            if (granted) {
                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
                    addFromImageOrFileAfterPermission("image/*", photoPickerLauncher, R.string.addFromImage, R.string.failedLaunchingPhotoPicker);
-                } else {
+                } else if (requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
                    addFromImageOrFileAfterPermission("application/pdf", pdfPickerLauncher, R.string.addFromPdfFile, R.string.failedLaunchingFileManager);
+                } else {
+                    addFromImageOrFileAfterPermission("application/*", pkpassPickerLauncher, R.string.addFromPkpass, R.string.failedLaunchingFileManager);
                }
            } else {
                setScannerActive(true);
--- a/app/src/main/java/protect/card_locker/ShortcutHelper.java
+++ b/app/src/main/java/protect/card_locker/ShortcutHelper.java
@@ -33,7 +33,6 @@ class ShortcutHelper {
    private static final int ADAPTIVE_BITMAP_SIZE = 108 * ADAPTIVE_BITMAP_SCALE;
    private static final int ADAPTIVE_BITMAP_VISIBLE_SIZE = 72 * ADAPTIVE_BITMAP_SCALE;
    private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
-    private static final int PADDING_COLOR_OVERLAY = Color.argb(127, 0, 0, 0);

    /**
     * Add a card to the app shortcuts, and maintain a list of the most
@@ -87,7 +86,7 @@ class ShortcutHelper {
        for (int index = 0; index < list.size(); index++) {
            ShortcutInfoCompat prevShortcut = list.get(index);

-            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(database, Integer.parseInt(prevShortcut.getId()));
+            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, Integer.parseInt(prevShortcut.getId()));

            // skip outdated cards that no longer exist
            if (loyaltyCard != null) {
@@ -120,7 +119,7 @@ class ShortcutHelper {
    Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) {
        Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
        Canvas output = new Canvas(ret);
-        output.drawColor(ColorUtils.compositeColors(PADDING_COLOR_OVERLAY, paddingColor));
+        output.drawColor(paddingColor);
        Bitmap resized = Utils.resizeBitmap(in, ADAPTIVE_BITMAP_IMAGE_SIZE);
        output.drawBitmap(resized, (ADAPTIVE_BITMAP_SIZE - resized.getWidth()) / 2f, (ADAPTIVE_BITMAP_SIZE - resized.getHeight()) / 2f, null);
        return ret;
@@ -133,15 +132,14 @@ class ShortcutHelper {
        // one replace it.
        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
        final Bundle bundle = new Bundle();
-        bundle.putInt("id", loyaltyCard.id);
-        bundle.putBoolean("view", true);
+        bundle.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);
        intent.putExtras(bundle);

-        Bitmap iconBitmap = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        Bitmap iconBitmap = loyaltyCard.getImageThumbnail(context);
        if (iconBitmap == null) {
            iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
        } else {
-            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.getHeaderColor(context, loyaltyCard));
+            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.needsDarkForeground(Utils.getHeaderColor(context, loyaltyCard)) ? Color.BLACK : Color.WHITE);
        }

        IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
--- a/app/src/main/java/protect/card_locker/UCropWrapper.java
+++ b/app/src/main/java/protect/card_locker/UCropWrapper.java
@@ -24,6 +24,13 @@ import com.yalantis.ucrop.UCropActivity;
 public class UCropWrapper extends UCropActivity {
    public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";

+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Utils.applyWindowInsets(findViewById(android.R.id.content));
+    }
+
    @Override
    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
        super.onPostCreate(savedInstanceState);
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -4,11 +4,13 @@ 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;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
@@ -26,6 +28,7 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -37,7 +40,10 @@ import androidx.annotation.RawRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.Insets;
 import androidx.core.os.LocaleListCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.core.widget.TextViewCompat;
 import androidx.exifinterface.media.ExifInterface;
@@ -45,13 +51,15 @@ 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;
+import com.google.zxing.DecodeHintType;
 import com.google.zxing.NotFoundException;
 import com.google.zxing.RGBLuminanceSource;
 import com.google.zxing.Result;
-import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.common.GlobalHistogramBinarizer;
 import com.google.zxing.multi.GenericMultipleBarcodeReader;
 import com.google.zxing.multi.MultipleBarcodeReader;

@@ -77,7 +85,9 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
+import java.util.EnumMap;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -95,12 +105,13 @@ public class Utils {
    public static final int BARCODE_SCAN = 3;
    public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
    public static final int BARCODE_IMPORT_FROM_PDF_FILE = 5;
-    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 6;
-    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 7;
-    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 8;
-    public static final int CARD_IMAGE_FROM_FILE_FRONT = 9;
-    public static final int CARD_IMAGE_FROM_FILE_BACK = 10;
-    public static final int CARD_IMAGE_FROM_FILE_ICON = 11;
+    public static final int BARCODE_IMPORT_FROM_PKPASS_FILE = 6;
+    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 7;
+    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 8;
+    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 9;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 10;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 11;
+    public static final int CARD_IMAGE_FROM_FILE_ICON = 12;

    public static final String CARD_IMAGE_FILENAME_REGEX = "^(card_)(\\d+)(_(?:front|back|icon)\\.png)$";

@@ -143,7 +154,7 @@ public class Utils {
        return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
    }

-    static public List<BarcodeValues> retrieveBarcodesFromImage(Context context, Uri uri) {
+    static public List<ParseResult> retrieveBarcodesFromImage(Context context, Uri uri) {
        Log.i(TAG, "Received image file with possible barcode");

        if (uri == null) {
@@ -162,7 +173,7 @@ public class Utils {
            return new ArrayList<>();
        }

-        List<BarcodeValues> barcodesFromBitmap = getBarcodesFromBitmap(bitmap);
+        List<ParseResult> barcodesFromBitmap = getBarcodesFromBitmap(bitmap);

        if (barcodesFromBitmap.isEmpty()) {
            Log.i(TAG, "No barcode found in image file");
@@ -172,7 +183,52 @@ public class Utils {
        return barcodesFromBitmap;
    }

-    static public List<BarcodeValues> retrieveBarcodesFromPdf(Context context, Uri uri) {
+    static public List<ParseResult> retrieveBarcodesFromPkPass(Context context, Uri uri) {
+        Log.i(TAG, "Received Pkpass file with possible barcode");
+        if (uri == null) {
+            Log.e(TAG, "Pkpass did not contain any data");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        PkpassParser pkpassParser;
+        try {
+             pkpassParser = new PkpassParser(context, uri);
+        } catch (Exception e) {
+            Log.e(TAG, "Error reading pkpass file", e);
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        List<String> locales = pkpassParser.listLocales();
+        if (locales.isEmpty()) {
+            try {
+                return Collections.singletonList(new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(null)));
+            } catch (Exception e) {
+                Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                return new ArrayList<>();
+            }
+        }
+
+        List<ParseResult> parseResultList = new ArrayList<>();
+        for (String locale : locales) {
+            ParseResult parseResult;
+            try {
+                 parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(locale));
+            } catch (Exception e) {
+                Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                return new ArrayList<>();
+            }
+            parseResult.setNote(locale);
+            parseResultList.add(parseResult);
+        }
+
+        return parseResultList;
+    }
+
+    static public List<ParseResult> retrieveBarcodesFromPdf(Context context, Uri uri) {
        Log.i(TAG, "Received PDF file with possible barcode");
        if (uri == null) {
            Log.e(TAG, "Uri did not contain any data");
@@ -182,7 +238,7 @@ public class Utils {

        ParcelFileDescriptor parcelFileDescriptor = null;
        PdfRenderer renderer = null;
-        List<BarcodeValues> barcodesFromPdfPages = new ArrayList<>();
+        List<ParseResult> barcodesFromPdfPages = new ArrayList<>();

        try {
            parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, "r");
@@ -194,13 +250,20 @@ public class Utils {
                for (int i = 0; i < renderer.getPageCount(); i++) {
                    PdfRenderer.Page page = renderer.openPage(i);
                    renderedPage = Bitmap.createBitmap(page.getWidth(), page.getHeight(), Bitmap.Config.ARGB_8888);
+
+                    // Ensure the page has a background
+                    // Fixes some transparent PDF files not being read well
+                    Canvas canvas = new Canvas(renderedPage);
+                    canvas.drawColor(Color.WHITE);
+                    canvas.drawBitmap(renderedPage, 0, 0, null);
+
                    page.render(renderedPage, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
                    page.close();

-                    List<BarcodeValues> barcodesFromPage = getBarcodesFromBitmap(renderedPage);
-                    for (BarcodeValues barcodeValues : barcodesFromPage) {
-                        barcodeValues.setNote(String.format(context.getString(R.string.pageWithNumber), i+1));
-                        barcodesFromPdfPages.add(barcodeValues);
+                    List<ParseResult> barcodesFromPage = getBarcodesFromBitmap(renderedPage);
+                    for (ParseResult parseResult : barcodesFromPage) {
+                        parseResult.setNote(String.format(context.getString(R.string.pageWithNumber), i+1));
+                        barcodesFromPdfPages.add(parseResult);
                    }
                }
            }
@@ -229,17 +292,17 @@ public class Utils {
    }

    /**
-     * Returns the Barcode format and content based on the result of an activity.
-     * It shows toasts to notify the end-user as needed itself and will return an empty
-     * BarcodeValues object if the activity was cancelled or nothing could be found.
+     * Returns the ParseResult based on the result of an activity.
+     * It shows toasts to notify the end-user as needed itself and will return an empty list if the
+     * activity was cancelled or nothing could be found.
     *
     * @param requestCode
     * @param resultCode
     * @param intent
     * @param context
-     * @return BarcodeValues
+     * @return List<ParseResult>
     */
-    static public List<BarcodeValues> parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+    static public List<ParseResult> parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
        String contents;
        String format;

@@ -255,6 +318,10 @@ public class Utils {
            return retrieveBarcodesFromPdf(context, intent.getData());
        }

+        if (requestCode == Utils.BARCODE_IMPORT_FROM_PKPASS_FILE) {
+            return retrieveBarcodesFromPkPass(context, intent.getData());
+        }
+
        if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
            if (requestCode == Utils.BARCODE_SCAN) {
                Log.i(TAG, "Received barcode information from camera");
@@ -268,7 +335,15 @@ public class Utils {
            Log.i(TAG, "Read barcode id: " + contents);
            Log.i(TAG, "Read format: " + format);

-            return Collections.singletonList(new BarcodeValues(format, contents));
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            if (format != null) {
+                loyaltyCard.setBarcodeType(CatimaBarcode.fromName(format));
+            }
+            if (contents != null) {
+                loyaltyCard.setCardId(contents);
+            }
+
+            return Collections.singletonList(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
        }

        throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
@@ -288,7 +363,7 @@ public class Utils {
        return MediaStore.Images.Media.getBitmap(context.getContentResolver(), data);
    }

-    static public List<BarcodeValues> getBarcodesFromBitmap(Bitmap bitmap) {
+    static public List<ParseResult> getBarcodesFromBitmap(Bitmap bitmap) {
        // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
        for (int i = 0; i < 10; i++) {
            try {
@@ -303,59 +378,67 @@ public class Utils {
        return new ArrayList<>();
    }

-    static private List<BarcodeValues> getBarcodesFromBitmapReal(Bitmap bitmap) {
+    static private List<ParseResult> getBarcodesFromBitmapReal(Bitmap bitmap) {
        // In order to decode it, the Bitmap must first be converted into a pixel array...
        int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
        bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());

        // ...and then turned into a binary bitmap from its luminance
        LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
-        BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
+        BinaryBitmap binaryBitmap = new BinaryBitmap(new GlobalHistogramBinarizer(source));

-        List<BarcodeValues> barcodeValuesList = new ArrayList<>();
+        List<ParseResult> parseResultList = new ArrayList<>();
        try {
            MultiFormatReader multiFormatReader = new MultiFormatReader();
            MultipleBarcodeReader multipleBarcodeReader = new GenericMultipleBarcodeReader(multiFormatReader);

-            Result[] barcodeResults = multipleBarcodeReader.decodeMultiple(binaryBitmap);
+            Map<DecodeHintType, Object> hints = new EnumMap<>(DecodeHintType.class);
+            hints.put(DecodeHintType.ALSO_INVERTED, Boolean.TRUE);
+
+            Result[] barcodeResults = multipleBarcodeReader.decodeMultiple(binaryBitmap,hints);

            for (Result barcodeResult : barcodeResults) {
                Log.i(TAG, "Read barcode id: " + barcodeResult.getText());
                Log.i(TAG, "Read format: " + barcodeResult.getBarcodeFormat().name());

-                barcodeValuesList.add(new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText()));
+                LoyaltyCard loyaltyCard = new LoyaltyCard();
+                loyaltyCard.setCardId(barcodeResult.getText());
+                loyaltyCard.setBarcodeType(CatimaBarcode.fromBarcode(barcodeResult.getBarcodeFormat()));
+                parseResultList.add(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
            }

-            return barcodeValuesList;
+            return parseResultList;
        } catch (NotFoundException e) {
-            return barcodeValuesList;
+            return parseResultList;
        }
    }

-    static public void makeUserChooseBarcodeFromList(Context context, List<BarcodeValues> barcodeValuesList, BarcodeValuesListDisambiguatorCallback callback) {
+    static public void makeUserChooseParseResultFromList(Context context, List<ParseResult> parseResultList, ParseResultListDisambiguatorCallback callback) {
        // If there is only one choice, consider it chosen
-        if (barcodeValuesList.size() == 1) {
-            callback.onUserChoseBarcode(barcodeValuesList.get(0));
+        if (parseResultList.size() == 1) {
+            callback.onUserChoseParseResult(parseResultList.get(0));
            return;
        }

        // Ask user to choose a barcode
        // TODO: This should contain an image of the barcode in question to help users understand the choice they're making
-        CharSequence[] barcodeDescriptions = new CharSequence[barcodeValuesList.size()];
-        for (int i = 0; i < barcodeValuesList.size(); i++) {
-            BarcodeValues barcodeValues = barcodeValuesList.get(i);
-            CatimaBarcode catimaBarcode = CatimaBarcode.fromName(barcodeValues.format());
+        CharSequence[] barcodeDescriptions = new CharSequence[parseResultList.size()];
+        for (int i = 0; i < parseResultList.size(); i++) {
+            ParseResult parseResult = parseResultList.get(i);
+            CatimaBarcode catimaBarcode = parseResult.getLoyaltyCard().barcodeType;

-            String barcodeContent = barcodeValues.content();
+            String barcodeContent = parseResult.getLoyaltyCard().cardId;
            // Shorten overly long barcodes
            if (barcodeContent.length() > 22) {
                barcodeContent = barcodeContent.substring(0, 20) + "…";
            }

-            if (barcodeValues.note() != null) {
-                barcodeDescriptions[i] = String.format("%s: %s (%s)", barcodeValues.note(), catimaBarcode.prettyName(), barcodeContent);
+            String parseResultNote = parseResult.getNote();
+
+            if (parseResultNote != null) {
+                barcodeDescriptions[i] = String.format("%s: %s (%s)", parseResultNote, catimaBarcode != null ? catimaBarcode.prettyName() : context.getString(R.string.noBarcode), barcodeContent);
            } else {
-                barcodeDescriptions[i] = String.format("%s (%s)", catimaBarcode.prettyName(), barcodeContent);
+                barcodeDescriptions[i] = String.format("%s (%s)", catimaBarcode != null ? catimaBarcode.prettyName() : context.getString(R.string.noBarcode), barcodeContent);
            }
        }

@@ -363,7 +446,7 @@ public class Utils {
        builder.setTitle(context.getString(R.string.multipleBarcodesFoundPleaseChooseOne));
        builder.setItems(
                barcodeDescriptions,
-                (dialogInterface, i) -> callback.onUserChoseBarcode(barcodeValuesList.get(i))
+                (dialogInterface, i) -> callback.onUserChoseParseResult(parseResultList.get(i))
        );
        builder.setOnCancelListener(dialogInterface -> callback.onUserDismissedSelector());
        builder.show();
@@ -513,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;
@@ -783,7 +871,7 @@ public class Utils {
        }
    }

-    public static Bitmap loadImage(String path) {
+    public static @Nullable Bitmap loadImage(String path) {
        try {
            return BitmapFactory.decodeStream(new FileInputStream(path));
        } catch (IOException e) {
@@ -792,7 +880,7 @@ public class Utils {
        }
    }

-    public static Bitmap loadTempImage(Context context, String name) {
+    public static @Nullable Bitmap loadTempImage(Context context, String name) {
        return loadImage(context.getCacheDir() + "/" + name);
    }

@@ -869,7 +957,7 @@ public class Utils {
        return typedValue.data;
    }

-    public static int getHeaderColorFromImage(Bitmap image, int fallback) {
+    public static int getHeaderColorFromImage(@Nullable Bitmap image, int fallback) {
        if (image == null) {
            return fallback;
        }
@@ -934,27 +1022,37 @@ public class Utils {
     * @param textWhenNoImage TextView to write the loyalty card name into if icon is null
     * @return background colour
     */
-    public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+    public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage, int columnCount) {
        int headerColor = getHeaderColor(context, loyaltyCard);
        backgroundOrIcon.setImageBitmap(icon);
-        backgroundOrIcon.setBackgroundColor(headerColor);

        if (icon != null) {
+            // Use header colour to decide if this image will need a white or black background
+            backgroundOrIcon.setBackgroundColor(needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+
+            // Ensure correct cropping style
+            backgroundOrIcon.setScaleType(Utils.getRecommendedScaleTypeForThumbnailImage(icon));
+
            textWhenNoImage.setVisibility(View.GONE);
        } else {
+            // Use header colour as background colour
+            backgroundOrIcon.setBackgroundColor(headerColor);
+
            // Manually calculate how many lines will be needed
            // This is necessary because Android's auto sizing will split over lines way before reaching the minimum font size and store names split over multiple lines are harder to scan with a quick glance so we should try to prevent it
            // Because we have to write the text before we can actually know the exact laid out size (trying to delay this causes bugs where the autosize fails) we have to take some... weird shortcuts

            // At this point textWhenNoImage.getWidth() still returns 0, so we cheat by calculating the whole width of the screen and then dividing it by the amount of columns
-            int textviewWidth = Resources.getSystem().getDisplayMetrics().widthPixels / context.getResources().getInteger(R.integer.main_view_card_columns);
+            int columnWidth = Resources.getSystem().getDisplayMetrics().widthPixels / columnCount;

            // Calculate how wide a character is and calculate how many characters fit in a line
+            // text size is generally based on height, so setting 1:1 as width may be fishy
            int characterWidth = TextViewCompat.getAutoSizeMinTextSize(textWhenNoImage);
-            int maxWidthPerLine = textviewWidth - textWhenNoImage.getPaddingStart() - textWhenNoImage.getPaddingEnd();
+            int maxWidthPerLine = columnWidth - textWhenNoImage.getPaddingStart() - textWhenNoImage.getPaddingEnd();

-            // Set amount of lines based on what could fit at most
-            int maxLines = ((loyaltyCard.store.length() * characterWidth) / maxWidthPerLine) + 1;
+            // Set number of lines based on what could fit at most
+            int fullTextWidth = loyaltyCard.store.length() * characterWidth;
+            int maxLines = (fullTextWidth / maxWidthPerLine) + 1;
            textWhenNoImage.setMaxLines(maxLines);

            // Actually set the text and colour
@@ -966,21 +1064,6 @@ public class Utils {
        return headerColor;
    }

-    public static boolean installedFromGooglePlay(Context context) {
-        try {
-            String packageName = context.getPackageName();
-            String installer;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                installer = context.getPackageManager().getInstallSourceInfo(packageName).getInstallingPackageName();
-            } else {
-                installer = context.getPackageManager().getInstallerPackageName(packageName);
-            }
-            return installer.equals("com.android.vending");
-        } catch (Throwable ignored) {
-            return false;
-        }
-    }
-
    public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
    }
@@ -1042,4 +1125,92 @@ public class Utils {
            return false;
        }
    }
+
+    public static void applyWindowInsets(View root) {
+        /* This function basically fakes the activity being edge-to-edge. Useful for those activities that are really hard to get to behave well */
+        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);
+
+            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
+        if (image == null) {
+            return ImageView.ScaleType.FIT_CENTER;
+        }
+
+        // If the image is relatively close to 85.6:53.98 (width = 1.58577250834 * height), allow cropping it to fit it
+        double ratio = (double) image.getWidth() / image.getHeight();
+        if (ratio >= 1.55 && ratio <= 1.60) {
+            return ImageView.ScaleType.CENTER_CROP;
+        }
+
+        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;
+    }
 }
--- a/app/src/main/java/protect/card_locker/ZipUtils.java
+++ b/app/src/main/java/protect/card_locker/ZipUtils.java
@@ -23,7 +23,7 @@ public class ZipUtils {
        return new JSONObject(read(zipInputStream));
    }

-    private static String read(ZipInputStream zipInputStream) throws IOException {
+    public static String read(ZipInputStream zipInputStream) throws IOException {
        StringBuilder stringBuilder = new StringBuilder();
        Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
        int c;
--- a/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
@@ -49,7 +49,7 @@ public class CatimaExporter implements Exporter {
        // Generate CSV
        ByteArrayOutputStream catimaOutputStream = new ByteArrayOutputStream();
        OutputStreamWriter catimaOutputStreamWriter = new OutputStreamWriter(catimaOutputStream, StandardCharsets.UTF_8);
-        writeCSV(database, catimaOutputStreamWriter);
+        writeCSV(context, database, catimaOutputStreamWriter);

        // Add CSV to zip file
        ZipParameters csvZipParameters = createZipParameters("catima.csv", password);
@@ -64,12 +64,12 @@ public class CatimaExporter implements Exporter {
        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
        while (cardCursor.moveToNext()) {
            // For each card
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor);

            // For each image
            for (ImageLocationType imageLocationType : ImageLocationType.values()) {
                // If it exists, add to the .zip file
-                Bitmap image = Utils.retrieveCardImage(context, card.id, imageLocationType);
+                Bitmap image = card.getImageForImageLocationType(context, imageLocationType);
                if (image != null) {
                    ZipParameters imageZipParameters = createZipParameters(Utils.getCardImageFileName(card.id, imageLocationType), password);
                    zipOutputStream.putNextEntry(imageZipParameters);
@@ -95,7 +95,7 @@ public class CatimaExporter implements Exporter {
        return zipParameters;
    }

-    private void writeCSV(SQLiteDatabase database, OutputStreamWriter output) throws IOException, InterruptedException {
+    private void writeCSV(Context context, SQLiteDatabase database, OutputStreamWriter output) throws IOException, InterruptedException {
        CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);

        // Print the version
@@ -142,7 +142,7 @@ public class CatimaExporter implements Exporter {
        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);

        while (cardCursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor);

            printer.printRecord(card.id,
                    card.store,
@@ -176,7 +176,7 @@ public class CatimaExporter implements Exporter {
        Cursor cardCursor2 = DBHelper.getLoyaltyCardCursor(database);

        while (cardCursor2.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor2);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor2);

            for (Group group : DBHelper.getLoyaltyCardGroups(database, card.id)) {
                printer.printRecord(card.id, group._id);
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -124,7 +124,7 @@ public class CatimaImporter implements Importer {
        Set<String> existingImages = DBHelper.imageFiles(context, database);

        for (LoyaltyCard card : data.cards) {
-            LoyaltyCard existing = DBHelper.getLoyaltyCard(database, card.id);
+            LoyaltyCard existing = DBHelper.getLoyaltyCard(context, database, card.id);
            if (existing == null) {
                DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
@@ -152,7 +152,7 @@ public class CatimaImporter implements Importer {
    }

    public boolean isDuplicate(Context context, final LoyaltyCard existing, final LoyaltyCard card, final Set<String> existingImages, final Map<String, String> imageChecksums) throws IOException {
-        if (!LoyaltyCard.isDuplicate(existing, card)) {
+        if (!LoyaltyCard.isDuplicate(context, existing, card)) {
            return false;
        }
        for (ImageLocationType imageLocationType : ImageLocationType.values()) {
@@ -490,7 +490,30 @@ public class CatimaImporter implements Importer {
            // We catch this exception so we can still import old backups
        }

-        return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed, DBHelper.DEFAULT_ZOOM_LEVEL, archiveStatus);
+        return new LoyaltyCard(
+                id,
+                store,
+                note,
+                validFrom,
+                expiry,
+                balance,
+                balanceType,
+                cardId,
+                barcodeId,
+                barcodeType,
+                headerColor,
+                starStatus,
+                lastUsed,
+                DBHelper.DEFAULT_ZOOM_LEVEL,
+                DBHelper.DEFAULT_ZOOM_LEVEL_WIDTH,
+                archiveStatus,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null
+        );
    }

    /**
--- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
@@ -149,7 +149,30 @@ public class FidmeImporter implements Importer {
        // TODO: Front and back image

        // use -1 for the ID, it will be ignored when inserting the card into the DB
-        return new LoyaltyCard(-1, store, note, null, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, Utils.getUnixTime(), DBHelper.DEFAULT_ZOOM_LEVEL, archiveStatus);
+        return new LoyaltyCard(
+                -1,
+                store,
+                note,
+                null,
+                null,
+                BigDecimal.valueOf(0),
+                null,
+                cardId,
+                null,
+                barcodeType,
+                headerColor,
+                starStatus,
+                Utils.getUnixTime(),
+                DBHelper.DEFAULT_ZOOM_LEVEL,
+                DBHelper.DEFAULT_ZOOM_LEVEL_WIDTH,
+                archiveStatus,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null
+        );
    }

    public void saveAndDeduplicate(SQLiteDatabase database, final ImportedData data) {
--- a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
@@ -9,8 +9,9 @@ import androidx.annotation.NonNull;

 import com.google.zxing.BarcodeFormat;

+import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.io.inputstream.ZipInputStream;
-import net.lingala.zip4j.model.LocalFileHeader;
+import net.lingala.zip4j.model.FileHeader;

 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
@@ -20,9 +21,7 @@ import org.json.JSONException;
 import org.json.JSONObject;

 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
@@ -130,11 +129,9 @@ public class StocardImporter implements Importer {
            throw new FormatException("Issue parsing CSV data", e);
        }

-        InputStream input = new FileInputStream(inputFile);
-        ZipInputStream zipInputStream = new ZipInputStream(input, password);
-        zipData = importZIP(zipInputStream, zipData);
-        zipInputStream.close();
-        input.close();
+        ZipFile zipFile = new ZipFile(inputFile, password);
+        zipData = importZIP(zipFile, zipData);
+        zipFile.close();

        if (zipData.cards.keySet().size() == 0) {
            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
@@ -144,7 +141,7 @@ public class StocardImporter implements Importer {
        saveAndDeduplicate(context, database, importedData);
    }

-    public ZIPData importZIP(ZipInputStream zipInputStream, final ZIPData zipData) throws IOException, FormatException, JSONException {
+    public ZIPData importZIP(ZipFile zipFile, final ZIPData zipData) throws IOException, FormatException, JSONException {
        Map<String, StocardRecord> cards = zipData.cards;
        Map<String, StocardProvider> providers = zipData.providers;

@@ -152,9 +149,8 @@ public class StocardImporter implements Importer {
        String[] cardBaseName = null;
        String customProviderId = "";
        String cardName = "";
-        LocalFileHeader localFileHeader;
-        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
-            String fileName = localFileHeader.getFileName();
+        for (FileHeader fileHeader : zipFile.getFileHeaders()) {
+            String fileName = fileHeader.getFileName();
            String[] nameParts = fileName.split("/");

            if (nameParts.length < 2) {
@@ -162,6 +158,7 @@ public class StocardImporter implements Importer {
            }

            String userId = nameParts[1];
+            ZipInputStream zipInputStream = zipFile.getInputStream(fileHeader);

            if (customProvidersBaseName == null) {
                // FIXME: can we use the points-account/statement/content.json balance info somehow?
@@ -302,6 +299,8 @@ public class StocardImporter implements Importer {
            } else if (!fileName.endsWith("/")) {
                Log.d(TAG, "Unknown or unused file " + fileName + ", skipping...");
            }
+
+            zipInputStream.close();
        }

        return new ZIPData(cards, providers);
@@ -355,7 +354,30 @@ public class StocardImporter implements Importer {

            long lastUsed = record.lastUsed != null ? record.lastUsed : Utils.getUnixTime();

-            LoyaltyCard card = new LoyaltyCard(tempID, store, note, null, null, BigDecimal.valueOf(0), null, record.cardId, null, barcodeType, headerColor, 0, lastUsed, DBHelper.DEFAULT_ZOOM_LEVEL, 0);
+            LoyaltyCard card = new LoyaltyCard(
+                    tempID,
+                    store,
+                    note,
+                    null,
+                    null,
+                    BigDecimal.valueOf(0),
+                    null,
+                    record.cardId,
+                    null,
+                    barcodeType,
+                    headerColor,
+                    0,
+                    lastUsed,
+                    DBHelper.DEFAULT_ZOOM_LEVEL,
+                    DBHelper.DEFAULT_ZOOM_LEVEL_WIDTH,
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+            );
            importedData.cards.add(card);

            Map<ImageLocationType, Bitmap> images = new HashMap<>();
--- a/Show More
+++ b/Show More