mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2025-12-30 18:47:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
635 Commits 41 Branches 151 Tags
3fd7991663dc498c201a92acfde6083b757488bf
Commit Graph

359 Commits

Author SHA1 Message Date
J. Lavoie
3fd7991663 Translated using Weblate (German) 
Currently translated at 100.0% (118 of 118 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2020-10-25 17:26:43 +01:00
Sylvia van Os
bcc988ff2c Fix upstream name 2020-10-23 19:25:10 +02:00
Sylvia van Os
344f7a9bc8 Fix unit tests 2020-10-22 20:11:26 +02:00
Sylvia van Os
efae7bda4c Modernize UI with FABs 2020-10-22 19:36:00 +02:00
Sylvia van Os
1cbf90a596 Remove intro 2020-10-22 18:35:33 +02:00
Sylvia van Os
9d4529b06b Initial rebrand 2020-10-22 18:15:07 +02:00
Sylvia van Os
d8776da8b6 Improve export/import dialog messages 2020-06-16 21:47:39 +02:00
Branden Archer
290abd9c56 Update for v0.28 2020-03-09 22:22:07 -07:00
Branden Archer
1fccfff338 Update translations from Transifex 2020-03-09 22:16:54 -07:00
Sylvia van Os
694e9b88d7 Fix translation inconsistency breaking Travis build 2020-03-08 20:52:38 +01: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
Branden Archer
3ae496427a Merge branch 'master' into master 2020-02-24 22:51:31 -08:00
Sylvia van Os
68bcd167a2 Merge branch 'master' into fix/fullscreen_leave_uncenter 2020-02-21 15:23:54 +01:00
Sylvia van Os
b7892df877 Merge branch 'master' into feature/choose_export_location 2020-02-21 15:21:50 +01:00
Sergio Paredes
bc63f3163c Merge branch 'master' into master 2020-02-04 15:25:13 +01:00
Branden Archer
b776f90b87 Update translations from Weblate 2020-02-01 16:13:14 -08:00
Sylvia van Os
6877828853 Make linter happy 2020-01-28 21:10:21 +01:00
Sylvia van Os
c94c3cb47e Choose export location 2020-01-28 21:01:33 +01:00
Sylvia van Os
454052638f Fix barcode centering 2020-01-28 17:32:57 +01:00
Sergio Paredes
1b060b26a5 Merge branch 'master' into master 2020-01-28 15:10:02 +01: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
Sergio
aa2ccac22b #308 Restore test check for barcode type 2020-01-27 00:53:55 +01:00
Sergio
e1f4ed65bb #308 Add missing cast from CharSequence to String 2020-01-27 00:53:55 +01:00
Sergio
72c1a57953 #308 Add new constructor for BarcodeImageWriterTask without associated TextView. Make barcode format selectable 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
649daf43df Revert "#308 Display barcode format on display loyalty card view" 
This reverts commit c194a9dd
 2020-01-27 00:53:54 +01:00
Sergio
fb9cf7a393 #308 Display barcode format on edit loyalty card view 2020-01-27 00:53:54 +01:00
Sergio
0d67680e7f #308 Display barcode format on select barcode view 2020-01-27 00:53:54 +01:00
Sergio
b5d41b0ab2 #308 Display barcode format on display 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
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
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
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