mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-05 07:39:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
958 Commits 39 Branches 157 Tags
45c71f01c273ea867ecb3275831c6969dfe0744d
Commit Graph

98 Commits

Author SHA1 Message Date
Sylvia van Os
45c71f01c2 Simplify balance parsing logic 2021-02-22 20:21:24 +01:00
Sylvia van Os
0af1935d20 Switch tests to USD 2021-02-21 18:00:06 +01:00
Sylvia van Os
9a37d917f7 Fix test URL 2021-02-20 22:59:51 +01:00
Sylvia van Os
d4f62435ae Add tests for balance 2021-02-20 22:10:23 +01:00
Sylvia van Os
0baf1ba348 Fix tests 2021-02-20 18:15:58 +01:00
Sylvia van Os
99a3849942 Fix missing lookup table update for groups update 2021-01-28 19:31:46 +01:00
Sylvia van Os
000d7722da Fix tests 2021-01-27 21:35:37 +01:00
Sylvia van Os
0dcfc11c53 Fix unit tests 2021-01-26 22:50:46 +01:00
Sylvia van Os
58f8a6a929 Fix bottomsheet misplacing after fullscreen change 2021-01-26 22:39:25 +01:00
Sylvia van Os
36ff2333b7 Fix all unit tests 2021-01-17 22:54:24 +01:00
Sylvia van Os
c408beb68c Progress on fixing tests 2021-01-17 18:24:21 +01:00
Sylvia van Os
1f76809300 Memory leak and spotBugs fixes 2021-01-04 19:58:08 +01:00
TacoTheDank
22fbbd3341 Migrate preferences to AndroidX 2020-12-26 19:05:18 -05:00
Sylvia van Os
bb866819db Cleanups 2020-12-15 23:11:18 +01:00
Sylvia van Os
eabd988540 Fix tests 2020-12-15 22:29:01 +01:00
Sylvia van Os
30a54ae22a Note size is no longer configurable 2020-12-03 18:18:32 +01:00
Sylvia van Os
c389a02d69 Fix tests 2020-12-02 18:36:23 +01:00
Sylvia van Os
c1606fef62 Manual group ordering 2020-11-27 22:33:59 +01:00
Sylvia van Os
158e424a47 Add dialog giving the user scan/manually enter options (#111) 2020-11-27 12:58:55 +01:00
Sylvia van Os
84d7f4fbba Fix unit tests 2020-11-22 18:26:05 +01:00
Sylvia van Os
3c1a54e456 Remove no longer relevant unit tests 2020-11-20 15:09:16 +01:00
D. Domig
da8b15a985 Update csv filename 2020-11-13 20:20:05 +01:00
Sylvia van Os
6b24f56c79 Fix unit tests 2020-11-10 22:25:16 +01:00
Sylvia van Os
3c793fe54f Fix logic and unit tests 2020-11-09 22:31:35 +01:00
Sylvia van Os
a766a25f6a Fix unit test 2020-11-06 21:13:57 +01:00
Sylvia van Os
4bbeb27714 Feature/groups (#71) 
* Basic group management

* Assign cards to groups

* Fix lint

* Fix findbugs 'dodgy code'

* Group name as unique key

* More group tests

* Import/export groups

* Implement group renaming and deleting

* Fix findBugs

* Fix chip marking in edit activity

* Group import/export tests

* Fix some state bugs

* Some last fixes

* Remove redundant if statement

* Fix findBugs

* Deduplicate code

* Cleanup

* Fix groups not showing up with new card

* Fix capture and enter button touching

* Fix dialog button look
 2020-11-06 18:12:06 +01:00
Sylvia van Os
8880e35a7a Fix some merge issues 2020-10-25 18:14:35 +01:00
t351206
c9f3054682 New feature: Favorite cards (#70) 2020-10-25 18:01:26 +01:00
Sylvia van Os
344f7a9bc8 Fix unit tests 2020-10-22 20:11:26 +02:00
Sylvia van Os
6ba4804d9a Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/choose_export_location 2020-03-08 18:10:54 +01:00
Sylvia van Os
c94c3cb47e Choose export location 2020-01-28 21:01:33 +01:00
Sergio
aa2ccac22b #308 Restore test check for barcode type 2020-01-27 00:53:55 +01:00
Sergio
24061dae97 #308 Hide barcode format on add loyalty card view 2020-01-27 00:53:55 +01:00
Sergio
fb9cf7a393 #308 Display barcode format on edit loyalty card view 2020-01-27 00:53:54 +01:00
Branden Archer
54ee93b0cb Merge branch 'master' into feature/fullscreenBarcode 2020-01-25 23:41:11 -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
3990992f68 Fix swapped import buttons 2020-01-18 13:37:47 +01:00
Sylvia van Os
aad98ba55b Fix NPE when sharing cards without header values 2020-01-09 20:16:54 +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
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
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
3aeea02300 Test button state 2019-12-11 14:23:13 +01:00
Sylvia van Os
72227f19e8 Fix comments 2019-12-11 11:38:53 +01:00
Sylvia van Os
19755f4f86 Add test 2019-12-09 13:44:25 +01:00
Sylvia van Os
33b84ad4c3 Allow barcodeless cards 2019-12-04 15:59:49 +01:00