mirror/Android
1
0 Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-09-17 09:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
118 Commits 31 Branches 165 Tags
a7d5b6fa0c0c306c9df6093930188a099babc3b8
Commit Graph
118 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
betsythefc a7d5b6fa0c New icon V2 2016-12-05 11:35:40 -08:00
betsythefc b49501e66a Merge remote-tracking branch 'brarcher/master' 2016-12-05 11:30:54 -08:00
Branden Archer 65d0f57358 Merge pull request #62 from techwebpd/patch-1 
Lithuanian strings.xml
 2016-12-03 11:35:32 -05:00
Branden Archer 927ac61912 Merge branch 'master' into patch-1 2016-12-03 11:29:52 -05:00
Branden Archer fd2b84f318 Remove string that did not need translating. 2016-12-03 11:29:44 -05:00
betsythefc ed4afed538 New Icon 2016-12-02 11:19:18 -08:00
Branden Archer 007427023b Merge pull request #70 from brarcher/changelog 
Create CHANGELOG.md
 2016-11-22 22:44:13 -05:00
Branden Archer b4ff68eddb Create CHANGELOG.md 
Per-request from:
https://github.com/brarcher/loyalty-card-locker/issues/48
 2016-11-22 22:35:49 -05:00
Branden Archer 151b81daa7 Merge pull request #69 from brarcher/pre-v0.8 
Update for release v0.8
v0.8 		2016-11-22 22:21:35 -05:00
Branden Archer c090af1c7d Update for release v0.8 2016-11-22 22:13:29 -05:00
Branden Archer 54a0f89821 Merge pull request #66 from lgasp/patch-1 
Small update to italian translation
 2016-11-06 15:07:58 -05:00
lgasp f01058d5b8 Update strings.xml 2016-11-05 11:19:48 +01:00
lgasp e01c77681b proposing less confusing trnalsation fo r button 
"Scan code" is translated as "salva tessera" that corresponds to English "save card",  that is similar to the button " save" on the same screen.
"Scansione codice"is a more literal, and hopefully more clear, translational
 2016-11-04 19:48:54 +01:00
Branden Archer c49ecdca56 Merge pull request #57 from pbeckmann/master 
Add a german translation.
 2016-11-02 14:37:18 -04:00
Peer Beckmann b7672e5247 Merge branch 'master' into master 2016-11-01 09:50:18 +01:00
techwebpd 71777a74fd Lithuanian strings.xml 
lithuanian translation
 2016-10-28 16:28:19 +03:00
Branden Archer bebab039d7 Merge pull request #60 from brarcher/screenshots 
Simplify screenshots in README.md
 2016-09-12 00:10:06 -04:00
Branden Archer 588a573878 Simplify screenshots in README.md 2016-09-11 23:56:32 -04:00
Branden Archer a9bbf8fb65 Merge pull request #59 from brarcher/screenshots 
Add screenshots to README.md
 2016-08-28 15:44:22 -04:00
Branden Archer 175135d695 Add screenshots to README.md 
Requested in:
https://github.com/brarcher/loyalty-card-locker/issues/56
 2016-08-28 15:30:23 -04:00
Branden Archer 9f08d07a6a Merge pull request #58 from Clonewayx/patch-1 
Czech translation
 2016-08-27 13:49:07 -04:00
Clonewayx 07f50b1544 Update and rename strings.xml to strings.xml 
remove untranslatable line
 2016-08-27 18:04:00 +02:00
Clonewayx 584064a4a2 Czech translation 2016-08-27 06:58:12 +02:00
Peer Beckmann 484f357a82 Add a german translation. 2016-08-25 19:57:55 +02:00
Branden Archer e32b40a024 Merge pull request #55 from brarcher/delete-confirmation 
Delete confirmation
 2016-07-22 08:04:15 -04:00
Branden Archer 010b88d477 Attempt to force travis builds on non-container infrastructure 
There is an issue with running the travis builds. The root
cause is unknown. Attempting to use the non-container
version of the infrastructure to see if the issue persists.
 2016-07-22 07:56:23 -04:00
Branden Archer fe0bb7b870 Add a confirmation before deleting card 
https://github.com/brarcher/loyalty-card-locker/issues/53
 2016-07-22 07:56:22 -04:00
Branden Archer 925f780599 Merge pull request #54 from brarcher/screen-brightness 
Adjust brightness to its maximum when displaying a card
 2016-07-20 00:04:42 -04:00
Branden Archer 9492d206d9 Adjust brightness to its maximum when displaying a card 
Some users have mentioned that a barcode scanner has the best
success when the screen is at its brightest. To enable the best
results, the screen brightness will now be adjusted to its
maximum when displaying a loyalty card.

https://github.com/brarcher/loyalty-card-locker/issues/21
 2016-07-19 23:42:36 -04:00
Branden Archer a32415b4d2 Reduce the number of cards tested in import/export tests 
There is no need to have so many cards tested in the test, just
a few will do to prove the point.
 2016-07-19 23:41:31 -04:00
Branden Archer 5965b82251 Merge pull request #51 from brarcher/pre-v0.7 
Update for release v0.7
v0.7 		2016-07-14 16:00:10 -04:00
Branden Archer a5650e6382 Update for release v0.7 2016-07-14 15:37:35 -04:00
Branden Archer 6befc99ccc Merge pull request #50 from brarcher/id-to-clipboard 
Copy card id to clipboard
 2016-07-14 14:56:20 -04:00
Branden Archer 0e124b2550 Allow long-click of card to copy id to clipboard 
https://github.com/brarcher/loyalty-card-locker/issues/49
 2016-07-14 13:38:42 -04:00
Branden Archer 06a7db0e6d Update Android gradle plugin to 2.1.2 2016-07-14 13:38:42 -04:00
Branden Archer f2f56b06dd Merge pull request #47 from brarcher/back-button 
Let pushing back button in menu end import/export activity
 2016-05-26 23:12:22 -04:00
Branden Archer 518f339c7a Let pushing back button in menu end import/export activity 2016-05-24 07:55:04 -04:00
Branden Archer bbe6ec3741 Merge pull request #46 from brarcher/pre-v0.6 
Update for release v0.6
v0.6 		2016-05-23 09:08:06 -04:00
Branden Archer 18310fdd25 Update for release v0.6 2016-05-23 08:52:27 -04:00
Branden Archer 19bd64c48c Merge pull request #44 from brarcher/manual-barcode-entry 
Allow manual barcode entry
 2016-05-23 08:51:28 -04:00
Branden Archer c86819fc74 Allow user to enter a barcode manually 
If a user is unable to scan a barcode, this commit allows a
user to enter is manually.

If the user selects to Enter Card instead of Capture Card,
the user may enter the card's id. As it may not be known which barcode
format the user expects, and the user may not know what barcode
type is what, all barcode types are generated from the user
input. Those that are valid are displayed to the user. The user
may then select the barcode image which matches what the user wants.

Italian translations provided by Michael Moroni (Airon90)
Dutch translations provided by PanderMusubi
 2016-05-23 08:43:52 -04:00
Branden Archer 8edc9ce5fd Set barcode image visibility upon completion 
If the barcode generation succeeds set it as visible, otherwise
make it gone.
 2016-05-21 22:58:08 -04:00
Branden Archer a3a5a3a8db Remove GlobalLayoutListener when no longer needed 2016-05-21 22:58:08 -04:00
Branden Archer 793247a48c Remove unused context 2016-05-21 22:58:08 -04:00
Branden Archer 2f86de4c1b Protect against unexpected failures when encoding barcodes 
It was observed that some barcode encoders will fail if the
data passed to them is not valid for the format. For example,
the ITF encoder will throw an ArrayIndexOutOfBoundsException
on the input "this is a test".
 2016-05-21 22:58:08 -04:00
Branden Archer 0aa1804258 Allow home button to back out to previous activity 2016-05-21 22:58:08 -04:00
Branden Archer 1c8ef34b8a Remove unneeded parentActivtyName attributes 2016-05-21 22:58:08 -04:00
Branden Archer 3fd45af7d9 Add dependency on Guava 2016-05-21 22:58:08 -04:00
Branden Archer 227af54de7 Merge pull request #43 from brarcher/datamatrix-scaling 
Datamatrix scaling
 2016-05-21 18:46:57 -04:00
Branden Archer b89c5eb91c Change padding of card list on main screen 
The entire space for the ListView was not being used, which
appeared odd.
 2016-05-21 18:32:29 -04:00