Code

WIP: Multiple barcode support#337

Code

Open

TheLastProject wants to merge 17 commits intobrarcher:masterbrarcher/loyalty-card-locker:masterfrom CatimaLoyalty:feature/multiple-barcodesCatimaLoyalty/Android:feature/multiple-barcodesCopy head branch name to clipboard

+472-51

Commits

Commits on Jan 4, 2020

• Add tab to switch between multiple barcodes of same store

  TheLastProject

  committed
  23bd60b

  Copy full SHA for 23bd60b

• Make it easy to add extra barcodes

  TheLastProject

  committed
  422501d

  Copy full SHA for 422501d

• Group together multiple barcodes of same store

  TheLastProject

  committed
  29eac68

  Copy full SHA for 29eac68

• Also add FAB button to main activity

  TheLastProject

  committed
  5030e4c

  Copy full SHA for 5030e4c

• Fix note not reappearing

  TheLastProject

  committed
  490281b

  Copy full SHA for 490281b

• Also add FAB to edit screen

  TheLastProject

  committed
  27d718b

  Copy full SHA for 27d718b

• Fix tests

  TheLastProject

  committed
  e395932

  Copy full SHA for e395932

• Add new tests

  TheLastProject

  committed
  524d649

  Copy full SHA for 524d649

• Rename barcodecount to card count because barcodeless card support

  TheLastProject

  committed
  1c71dc9

  Copy full SHA for 1c71dc9

Commits on Jan 5, 2020

• Swipe between different cards from store

  TheLastProject

  committed
  343d710

  Copy full SHA for 343d710

• Sanitize long and multiline notes

  TheLastProject

  committed
  520f0da

  Copy full SHA for 520f0da

• Merge branch 'master' into feature/multiple-barcodes

  TheLastProject

  authored
  67ada5c

  Copy full SHA for 67ada5c

• Fix tab state loss on rotation

  TheLastProject

  committed
  efd0f4e

  Copy full SHA for efd0f4e

• Merge branch 'feature/multiple-barcodes' of ssh://github.com/TheLastProject/loyalty-card-locker into feature/multiple-barcodes

  TheLastProject

  committed
  5b5ade0

  Copy full SHA for 5b5ade0

Commits on Jan 6, 2020

• More tabs into header to save some space

  TheLastProject

  committed
  67383a7

  Copy full SHA for 67383a7

Commits on Feb 21, 2020

• Merge branch 'master' into feature/multiple-barcodes

  TheLastProject

  authored
  d092cbe

  Copy full SHA for d092cbe

• Fix typo in merge

  TheLastProject

  authored
  0547fb9

  Copy full SHA for 0547fb9