mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-25 07:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,700 Commits 38 Branches 157 Tags
f932d8f6e4425c2c8554b20d8f68432cb2f4d936
Commit Graph

547 Commits

Author SHA1 Message Date
Sylvia van Os
71cd16caac Fix broken colours in Fidme import 2022-03-30 19:45:10 +02:00
Sylvia van Os
34639f2a2e Don't render text sequences as single character 2022-03-29 22:19:12 +02:00
Sylvia van Os
b5e6d40857 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2022-03-23 19:14:19 +01:00
Sylvia van Os
efef397870 Fix gray block appearing on invalid value for barcode 2022-03-23 19:13:54 +01:00
Sylvia van Os
420886bc3f Make SpotBugs happy 2022-03-22 21:59:35 +01:00
Sylvia van Os
86a01d36db Fix background color generation 2022-03-22 21:46:37 +01:00
Sylvia van Os
329293fa7c Support custom providers in Stocard import 2022-03-22 21:26:36 +01:00
Sylvia van Os
26bbea7377 Fix Stocard import getting stuck 2022-03-22 20:25:39 +01:00
Sylvia van Os
1ce4216584 Fix extreme padding on some barcode types 2022-03-09 19:07:19 +01:00
Sylvia van Os
61578a6016 Consistency improvements 2022-03-08 19:56:42 +01:00
Sylvia van Os
13695b5c37 Padding improvements 2022-03-07 22:57:42 +01:00
Sylvia van Os
6d134009be Merge pull request #819 from Kethen/emoji_icon 
emoji icons, color theme in short-cut selection menu
 2022-02-20 18:11:31 +01:00
Katharine Chui
d9f0ea8346 emoji icons, color theme in short-cut selection menu 2022-02-20 19:16:43 +08:00
Sylvia van Os
446131a87d Merge pull request #817 from Kethen/card_view_color_fix 
#803 cardView appbar icon fix
 2022-02-19 17:02:57 +01:00
Sylvia van Os
4680b53f86 Save card details expansion state 2022-02-19 15:44:35 +01:00
Katharine Chui
8423ea9b59 in cardView, hide iconImage manually instead of relying on appBarLayout height 2022-02-19 21:31:16 +08:00
Sylvia van Os
a5901700b4 Fix crash in edit activity on locale without region 2022-02-11 18:45:28 +01:00
Sylvia van Os
b24d641aa6 Fix manual language selection not applying anywhere 2022-02-10 22:36:51 +01:00
Sylvia van Os
14ef3086a4 Make spotBugs happy 2022-02-06 22:52:55 +01:00
Sylvia van Os
2fbe5a821c Fix main menu item hiding logic 2022-02-06 22:37:21 +01:00
Sylvia van Os
7dd2291376 Merge pull request #786 from Kethen/colors 
old color themes, ucrop color, edit button icon color by theme, ucrop toolbar font
 2022-02-06 11:49:35 +01:00
Katharine Chui
0552acae26 spotbug 2022-02-06 03:44:20 +08:00
Katharine Chui
18e30d2726 apply dynamic color instead of leaving it as catima theme for invalid theme key 2022-02-06 03:38:28 +08:00
Sylvia van Os
6a6a8fff2b Include basic error details on import failure 2022-02-05 16:54:40 +01:00
Katharine Chui
c9b8b2df9e requested changes 
theme color preference is now before pure black background preference

new setting string arrays for when dynamic color is not available

general refactoring and formatting changes
 2022-02-04 14:35:10 +08:00
Katharine Chui
3d138c9504 ucrop toolbar typeface 2022-02-03 20:40:52 +08:00
Katharine Chui
72b95988e5 hide catima theme when dynamic color is not available 2022-02-03 19:36:24 +08:00
Katharine Chui
188c147173 better themed color resolution for edit button on card view 2022-02-03 18:05:03 +08:00
Katharine Chui
6224a13d17 ucrop color 2022-02-03 17:53:32 +08:00
Katharine Chui
edf953cdad colors 2022-02-03 05:12:20 +08:00
Katharine Chui
d3b8569ef7 settings for pure black oled 2022-02-03 00:29:49 +08:00
Katharine Chui
329be8abbb various color fixes 
band-aid fixes for splash screen and material 3 dynamic color api

change editbutton icon's color in card view based on editbutton background color

make status bar transparent as per material 3, or tainted transparent for api level < 23 + light theme
 2022-02-02 01:46:09 +08:00
Sylvia van Os
917e60a7f5 Fix lint 2022-01-26 22:58:02 +01:00
Sylvia van Os
9887e19ec9 Fix cropper not using theme colour 2022-01-26 22:38:02 +01:00
Sylvia van Os
ce1a210650 Correctly make balancePoints a plural string 2022-01-18 23:14:12 +01:00
Sylvia van Os
0853bd88a4 Various theming fixes 2022-01-15 13:39:19 +01:00
Sylvia van Os
ebc2e07fc4 Use new URLs 2022-01-15 12:11:57 +01:00
Sylvia van Os
44473ae921 Hide search, expand and sort icons until there is at least one card 2022-01-15 11:57:52 +01:00
Sylvia van Os
13121e9869 Also colour scaler with card colour 2022-01-14 23:07:14 +01:00
Sylvia van Os
26fd3e3a58 Make spotBugs happy 2022-01-14 21:35:02 +01:00
Sylvia van Os
e79be213fc Fix lint 2022-01-14 21:26:29 +01:00
Sylvia van Os
2010b9a25c Card-related colours on view screen 2022-01-14 21:05:50 +01:00
Sylvia van Os
355c2f9ceb Material You redesign 2022-01-14 20:27:11 +01:00
Sylvia van Os
c73e7924ad Release Catima 2.13.1 2022-01-09 15:51:50 +01:00
Sylvia van Os
eb38d0a8aa Accessibility fixes 2022-01-07 22:02:51 +01:00
Sylvia van Os
58ebb7c7bf Improve star icon contrast in main view 2022-01-02 22:18:11 +01:00
Sylvia van Os
a7a775bc01 Put all barcode related fields together in the edit screen 2022-01-02 21:40:44 +01:00
Sylvia van Os
3883617a34 Smaller header when details are hidden 2022-01-02 00:10:37 +01:00
Sylvia van Os
af831cfdbd Fixed pressing the save button multiple times creating multiple entries 
Fixes #691
 2021-12-26 21:20:27 +01:00
Sylvia van Os
d4e388cf5d Fix some crashes after DB refactor 2021-12-16 22:49:22 +01:00