mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-15 10:27:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,605 Commits 42 Branches 155 Tags
googleAndroidStudioBugReport
Commit Graph

3605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Branden Archer
8c83b85cea Request external storage permission if necessary 
Starting on Android 6.0 permissions may be requested at
runtime. To allow import/exporting on 6.0+, request permission
to external storage.
 2016-05-16 20:51:59 -04:00
Branden Archer
b8f3d891ea Allow user to import/export cards to/from CSV on external storage 
Italian translations provided by Airon90.
Dutch translations provided by PanderMusubi
 2016-05-16 20:51:59 -04:00
Branden Archer
20338eb09b Add task for importing/exporting 2016-05-16 20:51:59 -04:00
Branden Archer
ce272fe7f1 Add ability to import/export cards to/from CSV 2016-05-16 20:51:59 -04:00
Branden Archer
fb34fb7451 Add call for writing card entry to specific id 
This will be necessary when importing card entries later
 2016-05-16 20:51:59 -04:00
Branden Archer
7b2d022e92 Merge pull request #35 from brarcher/gradle-wrappers 
Add wrapper scripts and instructions for building
 2016-04-22 09:27:49 -04:00
Branden Archer
283858a6e3 Add wrapper scripts and instructions for building 2016-04-22 08:58:38 -04:00
Branden Archer
d46b3c0810 Merge pull request #31 from brarcher/note-translation 
Update Italian translation for note
 2016-04-12 09:04:54 -04:00
Branden Archer
a2ff1a9e05 Update Italian translation for note 
Airon90 mentioned that although "Nota" is Italian for "Note", it would be better to use the plural
form "Note" here.
 2016-04-12 08:58:05 -04:00
Branden Archer
b2e333c379 Merge pull request #30 from brarcher/pre-v0.4 
Update for release v0.4
v0.4 		2016-04-09 22:26:30 -04:00
Branden Archer
2b058ee766 Update for release v0.4 2016-04-09 22:21:23 -04:00
Branden Archer
fc3302219e Merge pull request #29 from brarcher/note-field 
Add a note field
 2016-04-09 22:18:35 -04:00
Branden Archer
e0a77e9628 display store and note on card summary view 
Dutch translation provided by PanderMusubi

Related issues:
https://github.com/brarcher/loyalty-card-locker/issues/23
https://github.com/brarcher/loyalty-card-locker/issues/24
 2016-04-09 22:11:20 -04:00
Branden Archer
f6f749de1c Use multi exception catch for idential exceptions 2016-03-20 18:05:51 -04:00
Branden Archer
61dec10e74 Do not overwrite store field when capturing barcode 2016-03-20 18:05:51 -04:00
Branden Archer
9306e1a3d9 Add ability to store a note with loyalty card 2016-03-20 18:05:51 -04:00
Branden Archer
62e4fa402c split parts of test into separate methods 
in the future additional tests will be added, and this will
allow for more reuse
 2016-03-20 18:05:51 -04:00
Branden Archer
d12edd06a4 Merge pull request #28 from brarcher/dutch 
Add Dutch translations
 2016-03-16 23:02:28 -04:00
Branden Archer
4a8bc4744d Add Dutch translations 
These are provided by PanderMusubi

https://github.com/brarcher/loyalty-card-locker/issues/27
 2016-03-16 22:54:31 -04:00
Branden Archer
34faf18deb Merge pull request #26 from brarcher/edit-name 
Edit name
 2016-03-12 21:26:18 -05:00
Branden Archer
8c371751a7 Allow store name to be editable after creation 2016-03-11 21:53:38 -05:00
Branden Archer
c21c81f2c7 Correct names of unit tests 
Some of the tests mentioned "Gift" cards, but should mention
"Loyalty" cards instead. Additionally, made one unit test's
intention more clear.
 2016-03-11 21:53:38 -05:00
Branden Archer
77afaf1a3d Merge pull request #22 from brarcher/findbugs 
enable findbugs in travis-ci build
 2016-02-20 16:29:24 -05:00
Branden Archer
eb61f81b52 cat unit test failure report if failures found 2016-02-20 13:47:30 -05:00
Branden Archer
0289720c09 enable findbugs during travis-ci build 2016-02-20 13:46:53 -05:00
Branden Archer
5f2e3a5e1d Change inner class to be static 2016-02-20 13:31:34 -05:00
Branden Archer
5bc992f7f8 Merge pull request #15 from brarcher/readme 
mention barcode types in README.md
v0.3 		2016-02-11 06:32:17 -05:00
Branden Archer
a2ab434d01 Merge branch 'master' into readme 2016-02-11 01:36:03 -05:00
Branden Archer
9593b94a2b Merge pull request #16 from brarcher/pre-v0.3 
update version for next release
 2016-02-11 01:35:56 -05:00
Branden Archer
075a440e4f update version for next release 2016-02-11 01:30:12 -05:00
Branden Archer
c6967f6a3f mention barcode types in README.md 2016-02-11 01:29:30 -05:00
Branden Archer
a8ca5470c7 Merge pull request #14 from brarcher/update-zxing-android-embedded 
update zxing-android-embedded to latest release
 2016-02-11 01:22:41 -05:00
Branden Archer
4d277eff51 update zxing-android-embedded to latest release 
there was an issue with requesting camera permission
for Android 6 which was resolved in release 3.2.0.
 2016-02-11 01:00:02 -05:00
Branden Archer
c51531e367 Merge pull request #13 from brarcher/all-barcodes 
All barcodes
 2016-02-10 21:49:21 -05:00
Branden Archer
5e57d66daa Do not bring up keyboard in view activity 
Typically one will open the view activity to bring up a
barcode, and the keyboard is not expected. Disable the
keyboard until an editable field is selected.
 2016-02-10 21:42:57 -05:00
Branden Archer
73aff4aeb8 Support all barcodes zxing can generate 2016-02-10 21:42:57 -05:00
Branden Archer
e6241b5a47 Update to using latest zxing library release, 3.2.1 2016-02-10 21:42:57 -05:00
Branden Archer
dd0bb18234 Merge pull request #9 from brarcher/pre-v0.2 
Update version information for release
v0.2 		2016-02-07 22:00:49 -05:00
Branden Archer
35c778eadc Update version information for release 2016-02-07 21:56:02 -05:00
Branden Archer
63e0356ddd Merge pull request #8 from brarcher/camera-permission 
Camera permission
 2016-02-07 15:51:10 -05:00
Branden Archer
9820bca315 declare usage of the auto focus feature for the camera 
The zxing library will attempt to use auto focus on the camera,
if available.
 2016-02-07 15:38:07 -05:00
Branden Archer
2e457dc06e Add permission for using camera 
The zxing library will need this permission to work
correctly.
 2016-02-07 15:37:40 -05:00
Branden Archer
8bfd0f1215 Use multiple lines to declare features and permissions 
This is for readability.
 2016-02-07 15:37:15 -05:00
Branden Archer
cdbbf9222a Merge pull request #7 from brarcher/1d-barcodes 
Support scanning all types of 1D barcodes
 2016-02-03 15:16:47 -05:00
Branden Archer
96c665a539 Support scanning all types of 1D barcodes 
There are loyalty cards which are not product codes but are 1D
barcodes. Enabling support for all types of 1D barcodes to
enable more types of loyalty cards.
 2016-02-03 15:09:54 -05:00
Branden Archer
c0e8a33605 Merge pull request #6 from brarcher/readme 
Add F-Droid icon and fix grammer in README.md
 2016-02-02 22:51:48 -05:00
Branden Archer
fb96dfc8ac Add F-Droid icon and fix grammer in README.md 2016-02-02 22:27:20 -05:00
Branden Archer
41590706b5 Merge pull request #2 from Airon90/patch-1 
Create strings.xml for Italian translation
 2016-01-31 14:24:15 -05:00
Michael Moroni
59a7976ad5 Update strings.xml 
fix
 2016-01-31 14:35:16 +01:00
Michael Moroni
281fc30418 Create strings.xml 
Added Italian translation
 2016-01-31 14:09:37 +01:00