Branden Archer
7970bb8a40
Merge pull request #350 from brarcher/pre-v0.27
...
Update for v0.27
2020-01-26 22:41:14 -08:00
Branden Archer
8fa868e99b
Update for v0.27
2020-01-26 22:26:40 -08:00
Branden Archer
77a6cca57d
Merge pull request #329 from TheLastProject/fix/dark_mode_unscannable
...
Fix dark mode scanning issues
2020-01-26 22:21:43 -08:00
Branden Archer
5ab3a62e16
Merge branch 'master' into fix/dark_mode_unscannable
2020-01-26 22:15:18 -08:00
Branden Archer
171ec1cd7e
Merge pull request #348 from TheLastProject/feature/fullscreenBarcode
...
Move barcode to top on tap
2020-01-26 09:25:27 -08:00
Branden Archer
54ee93b0cb
Merge branch 'master' into feature/fullscreenBarcode
2020-01-25 23:41:11 -08:00
Sylvia van Os
fd6c66a86a
Improve documentation
2020-01-21 20:12:15 +01:00
Branden Archer
91044fdc87
Merge pull request #346 from TheLastProject/fix/swap_import_buttons
...
Fix swapped import buttons
2020-01-20 22:38:08 -08:00
Sylvia van Os
3600065ef8
Robolectric crashes if activity recreates
2020-01-19 19:55:08 +01:00
Sylvia van Os
4a7e8b6eba
Reset state on paused to prevent layout glitches
2020-01-19 19:07:06 +01:00
Sylvia van Os
2c12c312e3
Add unit tests
2020-01-19 17:46:50 +01:00
Sylvia van Os
f8943af402
Tap barcode to align to top
2020-01-19 16:45:17 +01:00
Sylvia van Os
3990992f68
Fix swapped import buttons
2020-01-18 13:37:47 +01:00
Branden Archer
d2ac0dacda
Merge pull request #344 from brarcher/pre-v0.26.1
...
Update for v0.26.1
2020-01-09 20:35:20 -08:00
Branden Archer
1a35150677
Update CHANGELOG for v0.26.1
2020-01-09 19:45:08 -08:00
Branden Archer
bf48e394e9
Update app for v0.26.1
2020-01-09 19:45:08 -08:00
Branden Archer
003aba52af
Merge pull request #343 from TheLastProject/fix/sharing_npe
...
Fix NPE when sharing cards without header values
2020-01-09 19:22:00 -08:00
Sylvia van Os
aad98ba55b
Fix NPE when sharing cards without header values
2020-01-09 20:16:54 +01:00
Branden Archer
2b50e503da
Merge pull request #339 from brarcher/pre-v0.26
...
Update for v0.26
2020-01-05 20:14:23 -08:00
Branden Archer
ab4c360c37
Update CHANGELOG for v0.26
2020-01-05 20:06:54 -08:00
Branden Archer
c76580d6be
Update app version to 0.26
2020-01-05 20:06:54 -08:00
Branden Archer
dc8ac6b574
Merge pull request #338 from brarcher/update-translations
...
Update translations
2020-01-05 19:45:12 -08:00
Branden Archer
0c23f25aca
Update translations
...
These were pulled from the Transifex project:
transifex.com/na-243/loyalty-card-locker
2020-01-05 19:35:51 -08:00
Branden Archer
47b9bbd30d
Merge pull request #336 from TheLastProject/fix/convert_to_barcodeless
...
Fix converting loyalty card to barcodeless
2020-01-04 17:28:39 -08:00
Sylvia van Os
ce81d3afd4
Fix as reviewed and add test
2020-01-02 21:15:06 +01:00
Sylvia van Os
cc99af13e4
Fix tests
2020-01-01 19:43:23 +01:00
Sylvia van Os
ccf3d1f3d6
Fix converting loyalty card to barcodeless
...
The LoyaltyCardEditActivity assumes on many places that an empty string
means it doesn't know a value yet. This patch ensures that the
BarcodeSelectorActivity returns a special string so that the
LoyaltyCardEditActivity can distinguish explicitly picking no barcode
from a not yet populated field.
2019-12-31 18:23:45 +01:00
Branden Archer
330ded0b5d
Merge pull request #334 from TheLastProject/fix/sdk28
...
Up targetSdk for Google Play
2019-12-30 19:45:46 -08:00
Sylvia van Os
0bcb0a7ab8
Up targetSdk to 29
2019-12-29 13:01:02 +01:00
Sylvia van Os
403c1fca33
Fix last error Travis reported
2019-12-28 21:25:17 +01:00
Sylvia van Os
ca12f8f914
Fix some of the errors Travis reported
2019-12-28 21:19:00 +01:00
Sylvia van Os
d5ba632bb3
Fix unit tests with Robolectric 4
2019-12-28 21:07:47 +01:00
Branden Archer
b9d158583b
Update to AndroidX
...
This is mostly the work of Android Studio's
Refactor > Migrate to AndroidX...
option. That mostly worked. The two places which were manually updated
were:
- The reference to AppBarLayout$ScrollingViewBehavior in
loyalty_card_edit_activity.xml
- The suggested constraintlayout version, 2.0.0-beta4 caused build
issues that 1.1.3 avoids
2019-12-28 19:57:27 +01:00
Sylvia van Os
32b4178950
Fix some warnings
2019-12-27 17:40:12 +01:00
Sylvia van Os
d9f97380d9
Fix status bar being white
2019-12-27 17:34:58 +01:00
Sylvia van Os
4e2fe97de5
Merge branch 'fix/sdk28' of ssh://github.com/TheLastProject/loyalty-card-locker into fix/sdk28
2019-12-27 17:27:48 +01:00
Sylvia van Os
1a3dee2c26
Update support libraries
2019-12-27 17:27:40 +01:00
Sylvia van Os
53f3a2109b
Merge branch 'master' into fix/sdk28
2019-12-27 17:16:21 +01:00
Sylvia van Os
c5c2f702d0
Up targetSdk for Google Play
2019-12-27 17:14:07 +01:00
Branden Archer
396801ba74
Merge pull request #326 from TheLastProject/feature/multiline_notes
...
Allow multiline notes
2019-12-24 19:33:31 -08:00
Branden Archer
67163539d5
Merge branch 'master' into feature/multiline_notes
2019-12-24 19:25:59 -08:00
Branden Archer
c1be6f2a88
Merge pull request #330 from TheLastProject/fix/white_on_white_icons
...
Fix white on white icons
2019-12-20 20:56:50 -08:00
Sylvia van Os
c0d1b446d1
Make same text and header color at least slightly visible
2019-12-16 13:23:16 +01:00
Sylvia van Os
d24a418beb
Fix status bar icon colors
2019-12-16 11:36:23 +01:00
Sylvia van Os
1f348295a0
Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into fix/white_on_white_icons
2019-12-15 21:36:56 +01:00
Sylvia van Os
280fe76609
Use DrawableCompat tinting instead
2019-12-15 21:29:34 +01:00
Branden Archer
8a3b623ea6
Merge pull request #324 from TheLastProject/feature/barcodeless_cards
...
Allow barcodeless cards
2019-12-15 12:01:42 -08:00
Sylvia van Os
e1f66e1917
Implement requested changes
2019-12-15 20:45:12 +01:00
Sylvia van Os
787bda1c77
Add test for empty barcode type
2019-12-15 14:28:48 +01:00
Sylvia van Os
c83b151c08
Revert "Check for empty cardId in BarcodeSelectorActivity instead"
...
This reverts commit 62f7241bca
2019-12-15 12:54:51 +01:00
