mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-20 21:08:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,354 Commits 43 Branches 156 Tags
18a2c3d907e7eb92012a4ecc08fa80b1461b930c
Commit Graph

111 Commits

Author SHA1 Message Date
Sylvia van Os
e3e1e0c85b Fix icons having white/black lines 
It's extremely hard to perfectly reach the 85.6:53.98 ratio, so if the
image is cropped close enough to it, we enable center cropping. This
allows a bit of the edges to be cut off to fully fill the image area.
 2025-04-24 18:16:49 +02:00
Sylvia van Os
91ee846054 Fix pkpass reading crashing Catima 2025-03-14 22:09:04 +01:00
Sylvia van Os
cc7553850a Target Android 15 
We apply window insets to basically not draw behind the top and bottom
bar. While this is a slight visual downgrade (we used to draw behind the
top bar before), it at least allows us to target Android 15.
 2025-03-09 16:51:06 +01:00
Sylvia van Os
91551bf4e8 Start using flavours 
Currently, this just allows us to remove the donation button on Google
Play without using the deprecated installer APIs.

In the future, this should allow us to also release multiple versions of
Catima (for example: WearOS is a commonly requested feature, but this
needs non-free dependencies, which may not be okay to all users).
 2024-12-24 14:33:35 +01:00
Sylvia van Os
75c393af92 Fix crash when trying to load invalid pkpass file 2024-12-12 17:13:49 +01:00
Sylvia van Os
1cb9ddecac Support for returning images from PkpassParser 2024-12-07 15:23:07 +01:00
Sylvia van Os
711ca1e761 Add option to load pkpass from ScanActivity 2024-12-07 15:23:07 +01:00
Sylvia van Os
8eeff0058b Refactor ScanActivity result code (use ParseResult) 2024-12-07 15:23:07 +01:00
Sylvia van Os
ea456c6d80 Add Pkpass parser 2024-12-07 15:23:05 +01:00
Sylvia van Os
88c1dd1bc6 Use black/white background colour instead of dominant colour for images 
This severely reduces the risk of a transparent PNG being put on a
background which is the same colour as the logo
 2024-11-29 17:37:03 +01:00
Sylvia van Os
389372e8f3 Fix parsing PDF with transparent background 2024-11-18 22:03:41 +01:00
Sylvia van Os
dc65030a63 Padding fixes to ensure the cards scale well without changing text size in LoyaltyCardViewActivity 2024-11-01 22:35:33 +01:00
Marnes
6f456437f7 implement #1952: custom column count 2024-11-01 18:27:41 +01:00
Sylvia van Os
727d9ce781 Refactor to allow updating a loyalty card from a bundle (#2051) 
This allows us to send any (partial) loyalty card into the edit
activity, granting us greater flexibility in what kind of scan result we
can parse
 2024-09-22 10:20:58 +02:00
Sylvia van Os
c123dd5d42 Allow store name thumbnails to span multiple lines 
Allowing spanning multiple lines helps in case the store name doesn't
fit on a single line. However, the store name should fit a single line
if possible because it looks better when the store name isn't split
among lines. Due to limitations in Android's autoSizeTextType system,
this needs a fairly ugly workaround.
 2024-07-01 19:42:35 +02:00
Sylvia van Os
a6b7b227f7 Support for devices without camera 
This hides the take photo options for thumbnail and front/back image and
shows a different alert if no camera is available
 2024-06-04 18:18:29 +02:00
Sylvia van Os
facb23f0a5 Properly fix decimal separator detection logic 2024-05-13 21:17:13 +02:00
Sylvia van Os
84bfa304c4 Disable currency grouping and accept thousand separator as decimal separator 2024-05-10 20:01:39 +02:00
simosathan9
9bb1602370 Fix balance unexpected rounding and app crashing issue (#1838) 
Co-authored-by:  Colette Kerr <colette.m.y.kerr@gmail.com>
 2024-04-24 21:41:22 +02:00
Dimitrios Papathanasiou
bdff59e628 Minor cleanups in PDF barcode retrieval (#1807) 2024-03-31 12:08:21 +02:00
Sylvia van Os
8519e12aa7 Add page number to barcode selector for PDF scan results 2024-03-24 20:31:03 +01:00
Sylvia van Os
0e873b9ea5 Basic selector when multiple barcodes found 2024-03-23 23:54:57 +01:00
Sylvia van Os
cbc8886241 Load barcode from PDF when sharing to Catima 2024-03-23 17:52:07 +01:00
Sylvia van Os
6c7bfb4c50 Initial PDF import through More Options menu 2024-03-23 17:52:07 +01:00
Sylvia van Os
b160b1dca8 Fix background colour not being set for images in card view 2024-02-28 18:55:28 +01:00
Sylvia van Os
027d153747 Don't version-guard the background colour fix 
All Android versions seem to need this for the main screen
 2024-01-28 12:41:52 +01:00
FC (Fay) Stegerman
7fa8ae8697 refactor nav bar colour & colour patching 2024-01-28 12:08:30 +01:00
FC (Fay) Stegerman
946a426b32 add null checks for getWindow() 2023-10-15 02:55:39 +02:00
Aayush Gupta
76b65b45bc CatimaAppCompatActivity: Set navigation bar color on Android 8.1+ 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 2023-10-05 11:19:16 +05:30
FC (Fay) Stegerman
8ba860f6c3 embed history/privacy policy/license in app (#1346) 2023-08-29 21:57:49 +02:00
Quang Trung
5668fb1152 Android 13 per app language support (#1447) 2023-08-29 19:06:07 +02:00
FC Stegerman
ac0f6f6f3e Utils.getRenamedCardImageFileName(): add javadoc 
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2023-07-17 20:35:02 +02:00
FC Stegerman
d11e2c166b Utils.copyToTempFile(): use try for resource management 2023-07-16 18:29:38 +02:00
FC Stegerman
f783be7a4f importer: handle inputFile errors better 2023-07-16 18:16:41 +02:00
FC Stegerman
48510494eb Utils: split off CARD_IMAGE_FILENAME_REGEX 2023-07-16 05:05:44 +02:00
FC Stegerman
d5d53b241a Utils: add getRenamedCardImageFileName() 2023-07-16 04:44:24 +02:00
FC Stegerman
84d7e15b5c LoyaltyCard: add isDuplicate(); Utils: add equals() 2023-07-16 03:29:31 +02:00
FC Stegerman
3a5973a04d Utils: add checksum() 2023-07-16 02:13:34 +02:00
FC Stegerman
bf05103955 import: copy ZIP, use File instead of InputStream 2023-07-16 00:45:18 +02:00
Sylvia van Os
6e390717da Make header colour code more consistent (#1363) 
- Ensure a header colour is picked for the main screen
- Simplify all different header colour code pickers into a single code
  path
 2023-06-10 18:34:49 +02:00
Sylvia van Os
2793f38d19 Move store name below card image 2023-06-04 14:55:26 +02:00
Sylvia van Os
654e3f7843 Improve text readability on icon 2023-06-04 11:20:17 +02:00
Sylvia van Os
2a6fe92b1b Support selecting exactly which details to view in main view 2023-06-04 11:06:35 +02:00
Sylvia van Os
1bb803ef0a Add donation link on non-Google installs 
Inspired by https://git.zx2c4.com/wireguard-android/commit/?id=dc1860c74dd67e18a66fe9e243eeffa689bef043
 2023-05-18 19:33:06 +02:00
Sylvia van Os
b48de921fc Redesign of home screen and view UI (#1296) 
* Redesign of home screen and view UI

* Update screenshots and CHANGELOG

* Make spotbugs happy

* Fix double store name announcement
 2023-05-17 21:15:56 +02:00
Sylvia van Os
339750e97c Update AGP to 8.0.0 2023-04-14 20:56:29 +02:00
Sylvia van Os
6653a940ed Make spotbugs happy 2023-04-10 21:36:35 +02:00
Alexander Ivanov
f1753ea943 Add Valid From field 
Signed-off-by: Alexander Ivanov <vanogrid@gmail.com>
 2023-02-01 19:22:20 +01:00
Pfaffenrodt
1aafcdc6ae Revert to reading file. Missing encoding 2022-10-29 14:44:02 +02:00
Pfaffenrodt
dff33d3bab Simplify reading contributors file 2022-10-29 14:19:36 +02:00