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
205 Commits 31 Branches 165 Tags
2d3bd4a375d05c8a66a28a6644f4556f8aaf2af2
Commit Graph
205 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Branden Archer 2d3bd4a375 Merge pull request #118 from brarcher/credit 
Add credit for save icon & update copyright string format
 2017-06-26 22:56:36 -04:00
Branden Archer de4ab95437 Add credit for save icon in about dialog 2017-06-26 22:10:09 -04:00
Branden Archer 09fba71710 Fix string format for copyright year 
The year is an integer, but the format was for a string.
 2017-06-26 22:10:09 -04:00
Branden Archer 2b84762b99 Merge pull request #117 from brarcher/changelog 
Update CHANGELOG for v0.11
v0.11 		2017-06-26 22:07:38 -04:00
Branden Archer 3a4850d5cf Merge branch 'master' into changelog 2017-06-26 21:59:46 -04:00
Branden Archer 5bc8a915d6 Update CHANGELOG for v0.11 2017-06-26 21:59:36 -04:00
Branden Archer 15cbd5b641 Merge pull request #116 from brarcher/pre-v0.11 
Update for v0.11 release
 2017-06-26 21:59:07 -04:00
Branden Archer d980079d76 Update for v0.11 release 2017-06-26 21:44:16 -04:00
Branden Archer e58cbd972e Merge pull request #112 from brarcher/readme 
Add attribution for save icon in README
 2017-06-24 21:38:15 -04:00
Branden Archer 1fbecd439b Add attribution for save icon in README 2017-06-22 22:16:42 -04:00
Branden Archer 707306ac81 Merge pull request #111 from brarcher/readme 
Update README with new screenshots
 2017-06-21 23:42:12 -04:00
Branden Archer 86152586cd Update README with new screenshots 2017-06-21 23:32:09 -04:00
Branden Archer fa33e4873e Merge pull request #109 from Airon90/patch-1 
Update strings.xml
 2017-06-20 22:43:40 -04:00
Branden Archer 24e4ef2d9b Merge branch 'master' into patch-1 2017-06-20 22:35:04 -04:00
Branden Archer eac4142392 Escape ' in strings.xml 2017-06-20 22:23:33 -04:00
Branden Archer f38a499bd8 Merge pull request #110 from brarcher/french 
Update French translations
 2017-06-20 22:21:45 -04:00
Branden Archer 0b8f52b87e Update French translations 
Provided by GitHub user arno-github.
 2017-06-20 22:14:27 -04:00
Michael Moroni c8255a2648 Update strings.xml 
Updated Italian (it) translation
 2017-06-20 19:41:13 +02:00
Branden Archer f28326e363 Merge pull request #108 from brarcher/intro 
First run intro wizard
 2017-06-18 23:46:37 -04:00
Branden Archer a9952d021b Update to Robolectric 3.3.2 
This is necessary, as Robolectric 3.0 did not work
with the newer Android SDK. Further, Robolectric 3.3.2
did not like running tests at SDK 17, so this was
also bumped.
 2017-06-18 23:39:02 -04:00
Branden Archer 9274339be8 Add intro wizard for application 2017-06-18 23:37:51 -04:00
Branden Archer 18caa01089 Move the ic_launcher.xcf file into a separate directory 2017-06-18 23:05:23 -04:00
Branden Archer ac495e1bf2 Add missing card add menu 
There was no save button when creating a new card.
 2017-06-18 23:05:22 -04:00
Branden Archer a8eecb8841 Merge pull request #107 from brarcher/layout-and-colors 
Layout and colors
 2017-06-18 22:02:20 -04:00
Branden Archer abdde45669 Update card view layout 
This layout uses a TableLayout and shows lines dividing the
different parts of an entry.
 2017-06-18 20:47:37 -04:00
Branden Archer 13b2faab39 Use save button in action bar 2017-06-18 15:37:40 -04:00
Branden Archer 433d31c30f Add super call in onCreateOptionsMenu 2017-06-18 15:37:40 -04:00
Branden Archer fa7dcd253a Change menus names to focus where they are, not what they contain 2017-06-18 15:37:40 -04:00
Branden Archer ac057f50e2 Change color palette to better match icon 
The green primary color was a bit of contrast with the icons grey.
 2017-06-18 15:37:40 -04:00
Branden Archer ef33c7a33f Merge pull request #106 from brarcher/french-strings 
Updated French strings.xml
 2017-06-18 14:36:38 -04:00
Branden Archer 6028f7d674 Updated French strings.xml 
Contributed by arno-github
 2017-06-18 14:30:55 -04:00
Branden Archer da5f999eed Merge pull request #104 from brarcher/edit-card 
Update "Enter card" button if card id exists
 2017-06-11 15:13:38 -04:00
Branden Archer 0a9124c834 Update "Enter card" button if card id exists 
If someone is editing an existing card, or is adding a card
and wants to change the value, update the name of the button
from "Enter card" to "Edit card", to give the impression that
a new card id need not by typed from scratch.
 2017-06-11 15:06:10 -04:00
Branden Archer c173012955 Merge pull request #103 from brarcher/limit-width 
Limit width of barcodes
 2017-06-11 15:05:27 -04:00
Branden Archer 64db9e593d Limit width of barcodes 
To reduce the amount of memory used in generating barcodes, limit
the width of the barcodes to no more than 3x the height.
This should be plenty sufficient to generate a usable barcode.

On devices with a really long width generating a barcode of 200x2560
is not useful and can result in an OutOfMemoryError.
 2017-06-11 14:56:17 -04:00
Branden Archer acde4ef181 Update to zxing 3.3.0 and zxing-android 3.5.0 2017-06-11 14:55:39 -04:00
Branden Archer 807ea25ac9 Merge pull request #102 from brarcher/privacy-policy 
Create privacy-policy.md
 2017-06-10 15:40:50 -04:00
Branden Archer ad4476fead Create privacy-policy.md 
This is required by Google for apps in the play store
which use certain permissions, such as the camera.
 2017-06-10 15:33:25 -04:00
Branden Archer f2c0e3904f Merge pull request #98 from brarcher/travis 
Travis-CI changes
 2017-05-20 18:07:47 -04:00
Branden Archer 0eeadbf77f Build only the release variant 
Building both debug and release was unnecessary, and only
increased the time to validate a pull request
 2017-05-20 13:36:23 -04:00
Branden Archer c0e95bd4da do not emit xml results 
gradle will output the failures, so this is unnecessary
 2017-05-20 13:35:57 -04:00
Branden Archer b7e8b8d36e Merge pull request #96 from brarcher/about 
About
 2017-03-06 21:49:53 -05:00
Branden Archer 2bca8b738a Change about dialog info to use map instead of String[][] 2017-03-05 14:42:19 -05:00
Branden Archer 2b617ceca5 Remove mention of Freepik icons from README 
The main application icon was replaced, and the icon from
Freepik is no longer used.
 2017-03-05 14:42:19 -05:00
Branden Archer 29838f4f73 Merge pull request #95 from brarcher/readme 
Add Google Play badge
 2017-03-04 00:08:04 -05:00
Branden Archer 1403d4a98e Add Google Play badge 
Adds a Google Play badge and updated the F-Droid badge to match
 2017-03-03 23:56:43 -05:00
Branden Archer c4b860bb3d Merge pull request #94 from brarcher/pre-populate-enter-card 
Pre-populate Barcode Selector
 2017-02-12 22:48:35 -05:00
Branden Archer 2768f4c590 Start with all barcode images visible 
If the user enters the barcode selector view with a pre-existing
id, the barcodes are immediately drawn. However, if the ImageViews
were invisible their initial size is not known, and as such the
generated barcode images are fuzzy or not as expected. To avoid this,
all images are set to be visible. The expectation is that once the
barcodes are drawn for the first time if they are invalid the images
will be made invisible anyway.
 2017-02-12 22:42:25 -05:00
Branden Archer 8660d4e218 Pre-populate card id in Barcode Selector 
If a user is attempting to update a card id of an existing card,
before when the Enter Card button was selected the barcode selector
view would be empty. To be more useful, the view will now be
pre-populated with the existing card id.
 2017-02-12 22:42:25 -05:00
Branden Archer 596d899449 Merge pull request #93 from brarcher/changelog 
Update changelog for v0.10
 2017-02-12 15:53:25 -05:00