mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-10 16:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
605 Commits 42 Branches 155 Tags
feature/multiple-barcodes
Commit Graph

349 Commits

Author SHA1 Message Date
Sylvia van Os
0547fb9949 Fix typo in merge 2020-02-21 16:22:24 +01:00
Sylvia van Os
d092cbe930 Merge branch 'master' into feature/multiple-barcodes 2020-02-21 15:29:26 +01:00
Branden Archer
b776f90b87 Update translations from Weblate 2020-02-01 16:13:14 -08:00
Branden Archer
8fa868e99b Update for v0.27 2020-01-26 22:26:40 -08:00
Branden Archer
5ab3a62e16 Merge branch 'master' into fix/dark_mode_unscannable 2020-01-26 22:15:18 -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
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
bf48e394e9 Update app for v0.26.1 2020-01-09 19:45:08 -08:00
Sylvia van Os
aad98ba55b Fix NPE when sharing cards without header values 2020-01-09 20:16:54 +01:00
Sylvia van Os
67383a7f10 More tabs into header to save some space 2020-01-06 21:54:52 +01:00
Branden Archer
c76580d6be Update app version to 0.26 2020-01-05 20:06:54 -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
Sylvia van Os
5b5ade0edc Merge branch 'feature/multiple-barcodes' of ssh://github.com/TheLastProject/loyalty-card-locker into feature/multiple-barcodes 2020-01-05 16:09:49 +01:00
Sylvia van Os
efd0f4ef39 Fix tab state loss on rotation 2020-01-05 16:09:21 +01:00
Sylvia van Os
67ada5c027 Merge branch 'master' into feature/multiple-barcodes 2020-01-05 14:47:58 +01:00
Sylvia van Os
520f0da983 Sanitize long and multiline notes 2020-01-05 14:22:15 +01:00
Sylvia van Os
343d710b2a Swipe between different cards from store 2020-01-05 14:16:13 +01:00
Sylvia van Os
1c71dc964f Rename barcodecount to card count because barcodeless card support 2020-01-05 00:50:08 +01:00
Sylvia van Os
524d649523 Add new tests 2020-01-05 00:36:44 +01:00
Sylvia van Os
e39593228d Fix tests 2020-01-05 00:12:12 +01:00
Sylvia van Os
27d718b461 Also add FAB to edit screen 2020-01-05 00:04:50 +01:00
Sylvia van Os
490281bff9 Fix note not reappearing 2020-01-05 00:00:37 +01:00
Sylvia van Os
5030e4c67a Also add FAB button to main activity 2020-01-04 23:52:36 +01:00
Sylvia van Os
29eac68e3f Group together multiple barcodes of same store 2020-01-04 23:45:28 +01:00
Sylvia van Os
422501da3e Make it easy to add extra barcodes 2020-01-04 23:00:23 +01:00
Sylvia van Os
23bd60b476 Add tab to switch between multiple barcodes of same store 2020-01-04 22:26:00 +01: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
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
67163539d5 Merge branch 'master' into feature/multiline_notes 2019-12-24 19:25:59 -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