mirror/Android
1
0 Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-09-18 03:01:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
363 Commits 32 Branches 165 Tags
1817c184aed8bad0ea673641458df2268464ae2e
Commit Graph
363 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Branden Archer 1817c184ae Merge pull request #205 from brarcher/fix-no-color-import 
Fix no color import
 2018-02-17 22:44:00 -05:00
Branden Archer 773d759ef5 Fix imports with missing colors 2018-02-17 22:37:10 -05:00
Branden Archer cbc51cfb73 Remove debug toast 2018-02-17 22:37:10 -05:00
Branden Archer 46c3d190d8 Merge pull request #204 from brarcher/custom-font-sizes 
Add settings for font sizes
 2018-02-17 16:29:54 -05:00
Branden Archer 9951999ca4 Add settings for font sizes 2018-02-17 16:05:10 -05:00
Branden Archer 4843a1093d Merge pull request #203 from brarcher/color-picker 
Custom colors
 2018-02-17 16:02:54 -05:00
Branden Archer a4bde722a6 Add config for text and background colors 
This adds config options for the colors used for the store text
and background when displaying the store name in the single
card view or the thumbnail for the card list.
 2018-02-17 15:50:32 -05:00
Branden Archer ff5e5d5833 Remove unused code handling adding a card 
This case is handled in another acitivity now.
 2018-02-12 15:13:23 -05:00
Branden Archer 685eaec8b5 Remove views which are no longer used 2018-02-12 15:13:23 -05:00
Branden Archer a3556cc66d Merge pull request #200 from brarcher/barcode-space 
Add quite space before and after barcode
 2018-02-10 22:27:45 -05:00
Branden Archer 13543ea9f6 Add quite space before and after barcode 
This is to help barcode scanners determine where the end of
the barcode is.
 2018-02-10 22:21:35 -05:00
Branden Archer d7bf31c308 Merge pull request #199 from brarcher/changelog-1 
Update CHANGELOG
 2018-02-10 22:13:27 -05:00
Branden Archer a77a968619 Update CHANGELOG 2018-02-10 22:06:35 -05:00
Branden Archer 70c6ee17cd Merge pull request #198 from brarcher/pre-v0.20 
Update for v0.20
v0.20 		2018-02-10 22:02:04 -05:00
Branden Archer c233f82dc1 Update for v0.20 2018-02-10 13:50:30 -05:00
Branden Archer be0c2507f2 Merge pull request #197 from brarcher/layout-changes 
Layout changes for new card view layout
 2018-02-10 13:49:22 -05:00
Branden Archer abfcf9d6cd Disable MissingPrefix lint 
The autosizing TextView, which comes from the support-v4 library,
adds several new attributes to TextViews. These attributes do not
seem to be in the app namespace (as described in the documentation),
as Android Studio and lint complains. However, funtionally the new
attributes work as expected.
 2018-02-10 13:43:28 -05:00
Branden Archer 4d565b3b2f Update screenshots and wizard images 2018-02-10 13:37:17 -05:00
Branden Archer 27511a4ccd Make card id and note text selectable 2018-02-10 13:37:17 -05:00
Branden Archer 12440346fa Replace letter icon with store name 2018-02-10 13:37:17 -05:00
Branden Archer 870e4d0c4a Add note text to card view layout 2018-02-10 13:37:17 -05:00
Branden Archer 6e526de087 Auto-size card id text on card view layout 2018-02-10 13:37:16 -05:00
Branden Archer 891636b51f Use ConstraintLayout for card view layout 
This way the size of the barcode can be 1/2 the screen.
 2018-02-10 13:37:16 -05:00
Branden Archer 017d97d08c Merge pull request #196 from brarcher/feature-graphic 
add feature graphic to metadata
 2018-02-09 23:30:09 -05:00
Branden Archer 63165ca1a5 add feature graphic to metadata 2018-02-09 23:21:46 -05:00
Branden Archer 48f40a51d1 Merge pull request #192 from brarcher/brarcher-patch-1 
Update CHANGELOG
 2018-02-01 08:13:51 -05:00
Branden Archer 3940ba5756 Update CHANGELOG 2018-02-01 08:05:10 -05:00
Branden Archer b8a36e3c45 Merge pull request #191 from brarcher/pre-v0.19 
Update for v0.19
v0.19 		2018-02-01 08:02:20 -05:00
Branden Archer 60deaae8d5 Update for v0.19 2018-02-01 07:54:48 -05:00
Branden Archer a71da8d6dc Merge pull request #190 from brarcher/card-layout 
Improve card view layout
 2018-01-31 23:39:37 -05:00
Branden Archer dbbbd128dc Update intro and metadata graphics 2018-01-31 23:19:19 -05:00
Branden Archer 3275279501 Remove unnecessary casts from findViewById 2018-01-31 22:49:31 -05:00
Branden Archer 2f6516ffb9 Display note on separate line, omit card id on card list 
The card id was of dubious value, because the main screen
is really for selecting the card. The note may have more value,
as it may specify info about the card.
 2018-01-31 22:49:31 -05:00
Branden Archer 41c8b78275 Move store name text size to dimens.xml 2018-01-31 22:49:31 -05:00
Branden Archer 6ed96393d5 Change layout of single card view 
This changes the layout when viewing a single card. The new layout
will have a colored area at the top which displays the first letter
of the company, and after that the barcode. The note will be displayed
on the card list screen and is presently omitted here.

As this layout is experimental, the layout for editing a card is
not yet updated. To achieve this the card viewing activity is split
into two separate classes, where one handles viewing and one handles
editing. When the view layout finalizes the edit icon can be updated
as time allows.
 2018-01-31 22:49:31 -05:00
Branden Archer 3519e03568 Merge pull request #188 from brarcher/card-list-layout 
Improve card list layout
 2018-01-28 15:08:03 -05:00
Branden Archer 1aef3f5253 Preserve float result from division 
The arguments to drawText for x and y are float, but
dividing two integers truncates the result to an integer.
 2018-01-28 14:21:53 -05:00
Branden Archer c97e80432f Support non-English letters for default card thumbnail 2018-01-28 09:49:21 -05:00
Branden Archer c6265eb9e3 Add generated icon for cards in card list 
This add a thumbnail of a single letter for each card,
consisting of the first letter of the card and a
pastel background.

This was adapted from the andOTP project.
 2018-01-27 20:05:57 -05:00
Branden Archer 935cd97f99 Improve layout for card list 
This now includes an icon and emphasizes the store name.

This was adapted from the andOTP project.
 2018-01-27 20:03:37 -05:00
Branden Archer e65d096e76 Merge pull request #187 from brarcher/pre-v0.18.1 
Update for v0.18.1
v0.18.1 		2018-01-24 17:39:03 -05:00
Branden Archer 8d38918a12 Update for v0.18.1 2018-01-24 17:28:37 -05:00
Branden Archer 57f2c7acd4 Merge pull request #186 from brarcher/changelog 
Update CHANGELOG
 2018-01-24 17:28:02 -05:00
Branden Archer 7fb6e4a8d3 Update CHANGELOG 2018-01-24 17:19:10 -05:00
Branden Archer 56d20939be Merge pull request #185 from brarcher/contributing 
Create CONTRIBUTING.md
 2018-01-24 16:21:42 -05:00
Branden Archer a3968f8894 Create CONTRIBUTING.md 2018-01-24 16:06:05 -05:00
Branden Archer 74dd292f5a Merge pull request #184 from brarcher/install-crash-workaround 
Workaround install crash on Android 5 and below
 2018-01-24 13:22:08 -05:00
Branden Archer d7a7528114 Workaround install crash on Android 5 and below 
The aapt2 tool, new to Android Studio 3, creates an APK which fails
to install on Android 5 and below if it contains the following bug:

   https://issuetracker.google.com/issues/64434571

Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting
the bug.
 2018-01-24 08:37:53 -05:00
Branden Archer bffeca9033 Merge pull request #182 from brarcher/changelog 
Update Changelog
 2018-01-19 23:46:15 -05:00
Branden Archer 5a88afb9f3 Update Changelog 2018-01-19 23:39:25 -05:00