Merge pull request #69 from brarcher/pre-v0.8

Update for release v0.8
2025-12-25 08:07:56 -05:00 · 2016-11-22 22:21:35 -05:00 · 2016-11-22 22:13:29 -05:00 · 2016-11-06 15:07:58 -05:00 · 2016-11-05 11:19:48 +01:00 · 2016-11-04 19:48:54 +01:00
10 changed files with 184 additions and 11 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: android
+sudo: true
 android:
  components:
    # Uncomment the lines below if you want to
--- a/README.md
+++ b/README.md
@@ -21,6 +21,14 @@ Stores all of your store loyalty cards on your phone, removing the need to carry
 If there is any interest in improving this project, kindly submit a pull request with
 proposed changes.

+# Screenshots
+
+[<img src="https://cloud.githubusercontent.com/assets/5264535/18036233/32fae9a6-6d33-11e6-81e4-55ba60e83d9b.png" width=250>](https://cloud.githubusercontent.com/assets/5264535/18036233/32fae9a6-6d33-11e6-81e4-55ba60e83d9b.png)
+[<img src="https://cloud.githubusercontent.com/assets/5264535/18036246/7ee5c7f0-6d33-11e6-90cf-d2b3ca5a94c7.png" width=250>](https://cloud.githubusercontent.com/assets/5264535/18036246/7ee5c7f0-6d33-11e6-90cf-d2b3ca5a94c7.png)
+
+[<img src="https://cloud.githubusercontent.com/assets/5264535/18036258/bb19562e-6d33-11e6-856e-740e8785ad71.png" width=250>](https://cloud.githubusercontent.com/assets/5264535/18036258/bb19562e-6d33-11e6-856e-740e8785ad71.png)
+[<img src="https://cloud.githubusercontent.com/assets/5264535/18036269/0202baf8-6d34-11e6-9c17-449d5b348738.png" width=250>](https://cloud.githubusercontent.com/assets/5264535/18036269/0202baf8-6d34-11e6-9c17-449d5b348738.png)
+
 # Building

 To build, use the gradle wrapper scripts provided in the top level directory of the project. The following will
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 11
        targetSdkVersion 23
-        versionCode 7
-        versionName "0.7"
+        versionCode 8
+        versionName "0.8"
    }
    buildTypes {
        release {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -2,11 +2,13 @@ package protect.card_locker;


 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
@@ -14,6 +16,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -56,6 +60,20 @@ public class LoyaltyCardViewActivity extends AppCompatActivity

        Log.i(TAG, "To view card: " + loyaltyCardId);

+        if(viewLoyaltyCard)
+        {
+            // The brightness value is on a scale from [0, ..., 1], where
+            // '1' is the brightest. We attempt to maximize the brightness
+            // to help barcode readers scan the barcode.
+            Window window = getWindow();
+            if(window != null)
+            {
+                WindowManager.LayoutParams attributes = window.getAttributes();
+                attributes.screenBrightness = 1F;
+                window.setAttributes(attributes);
+            }
+        }
+
        final EditText storeField = (EditText) findViewById(R.id.storeName);
        final EditText noteField = (EditText) findViewById(R.id.note);
        final EditText cardIdField = (EditText) findViewById(R.id.cardId);
@@ -275,11 +293,33 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                break;

            case R.id.action_delete:
-                Log.e(TAG, "Deleting card: " + loyaltyCardId);
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle(R.string.deleteTitle);
+                builder.setMessage(R.string.deleteConfirmation);
+                builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener()
+                {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which)
+                    {
+                        Log.e(TAG, "Deleting card: " + loyaltyCardId);
+
+                        DBHelper db = new DBHelper(LoyaltyCardViewActivity.this);
+                        db.deleteLoyaltyCard(loyaltyCardId);
+                        finish();
+                        dialog.dismiss();
+                    }
+                });
+                builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
+                {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which)
+                    {
+                        dialog.dismiss();
+                    }
+                });
+                AlertDialog dialog = builder.create();
+                dialog.show();

-                DBHelper db = new DBHelper(this);
-                db.deleteLoyaltyCard(loyaltyCardId);
-                finish();
                return true;
            case R.id.action_edit:
                Intent intent = new Intent(getApplicationContext(), LoyaltyCardViewActivity.class);
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,64 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="app_name">Loyalty Card Locker</string>
+    <string name="action_add">Přidat</string>
+
+    <string name="noGiftCards">ZAtím némáte žádné věrnostní karty. Klikněte na tlačítko "+" (plus) nahoře a začněte.\n\nLoyalty Card Locker umožňuje nosit své věrnostní karty v telefonu, takže jsou vždy na dosah.</string>
+
+    <string name="storeName">Obchod</string>
+    <string name="note">Poznámka</string>
+    <string name="cardId">ID karty</string>
+    <string name="barcodeType">Typ čárového kódu</string>
+
+    <string name="cancel">Zrušit</string>
+    <string name="save">Uložit</string>
+    <string name="capture">Naskenovat kartu</string>
+    <string name="enterCard">Vložit vlastnoručně</string>
+    <string name="edit">Editovat</string>
+    <string name="delete">Smazat</string>
+    <string name="confirm">Potvrdit</string>
+    <string name="deleteTitle">Odstzranit věrnostní kartu</string>
+    <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
+    <string name="ok">Ano</string>
+    <string name="copy_to_clipboard">Kopírovat ID do schránky</string>
+
+    <string name="editCardTitle">Editovat věrnostní kartu</string>
+    <string name="addCardTitle">Přidat věrnostní kartu</string>
+    <string name="viewCardTitle">Zobrazit věrnostní kartu</string>
+    <string name="scanCardBarcode">Oskenujte kód karty</string>
+
+    <string name="barcodeImageDescription">Obrázek kódu karty</string>
+
+    <string name="noStoreError">Nebyl zadán Obchod</string>
+    <string name="noCardIdError">Nebylo zadáno ID karty</string>
+
+    <string name="cardIdFormat">%1$s: %2$s</string>
+
+    <string name="importExport">Import/Export</string>
+    <string name="importName">Import</string>
+    <string name="exportName">Export</string>
+    <string name="importExportHelp">Data jsou importována do/z LoyaltyCardLocker.csv na externí úložišti.</string>
+    <string name="importedFrom">Importováno z: %1$s</string>
+    <string name="exportedTo">Exportováno do: %1$s</string>
+    <string name="fileMissing">Doubor chybí: %1$s</string>
+    <string name="importFailed">Import selhal: %1$s</string>
+    <string name="exportFailed">Export selhal: %1$s</string>
+    <string name="importing">Importuji&#8230;</string>
+    <string name="exporting">Exportuji&#8230;</string>
+    <string name="noExternalStoragePermissionError">Nelze importovat nebo exportovat karty bez přístupu k externímu uložišti</string>
+
+    <string name="about">O aplikaci</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_license">Licensed under the GPLv3.</string>
+    <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Revizní informace: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používá tyto knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Vyberte čárový kód</string>
+    <string name="enterBarcodeInstructions">Zadejte hodnotu čárového kódu a potm vyberte kód, který představuje čárový kód, který je na kartě.</string>
+
+    <string name="copy_to_clipboard_toast">ID karty zkopírováno do schránky</string>
+
+</resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Loyalty Card Locker</string>
+    <string name="about">Über</string>
+    <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="action_add">Neu</string>
+    <string name="addCardTitle">Neue Kundenkarte</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_license">Lizensiert unter der GPLv3.</string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="viewCardTitle">Kundenkarte anzeigen</string>
+    <string name="ok">Ok</string>
+    <string name="note">Notiz</string>
+    <string name="save">Speichern</string>
+    <string name="scanCardBarcode">Barcode scannen</string>
+    <string name="selectBarcodeTitle">Barcode auswählen</string>
+    <string name="storeName">Firma</string>
+    <string name="noStoreError">Keine Firma angegeben</string>
+    <string name="exportName">Exportieren</string>
+    <string name="exportedTo">Exportiert nach: %1$s</string>
+    <string name="fileMissing">Datei fehlt: %1$s</string>
+    <string name="importExport">Import/Export</string>
+    <string name="importFailed">Import fehlgeschlagen: %1$s</string>
+    <string name="importName">Import</string>
+    <string name="importedFrom">Importiert von: %1$s</string>
+    <string name="noCardIdError">Keine Kartennummer angegeben</string>
+    <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
+    <string name="noGiftCards">Du hast noch keine Kundenkarte angelegt. Über den "+" Button oben rechts, kannst du welche anlegen.\n\nDiese App ermöglicht es dir, deine Kundenkarten immer mit dir zu führen.</string>
+    <string name="cancel">Abrechen</string>
+    <string name="capture">Karte aufnehmen</string>
+    <string name="cardId">Kartennummer</string>
+    <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="confirm">Bestätigen</string>
+    <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
+    <string name="delete">Löschen</string>
+    <string name="deleteConfirmation">Bitte bestätige, dass du die Karte löschen möchtest.</string>
+    <string name="deleteTitle">Lösche die Kundenkarte</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="editCardTitle">Kundenkarte bearbeiten</string>
+    <string name="enterCard">Karte einfügen</string>
+    <string name="exportFailed">Export fehlgeschlagen: %1$s</string>
+    <string name="barcodeType">Barcodeart</string>
+    <string name="barcodeImageDescription">Bild des Barcodes</string>
+    <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
+    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
+    <string name="enterBarcodeInstructions">Füge die Kundennummer ein, anschließend wähle die korrekte Barcodeart aus.</string>
+    <string name="app_revision_fmt">Versions Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="importExportHelp">Daten werden aus LoyalityCardLocker.csv aus dem externen Speicher im-/exportiert.</string>
+    <string name="importing">Importiere…</string>
+    <string name="exporting">Exportiere…</string>
+</resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -12,7 +12,7 @@

    <string name="cancel">Annulla</string>
    <string name="save">Salva</string>
-    <string name="capture">Salva tessera</string>
+    <string name="capture">Scansione carta</string>
    <string name="edit">Modifica</string>
    <string name="delete">Elimina</string>

@@ -54,4 +54,7 @@
    <string name="enterBarcodeInstructions">Digita il valore del codice a barre, quindi seleziona l\'immagine che rappresenta il codice a barre che vuoi usare.</string>
    <string name="copy_to_clipboard">Copia ID negli appunti</string>
    <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
+    <string name="confirm">Conferma</string>
+    <string name="deleteTitle">Rimuovi carta fedeltà</string>
+    <string name="deleteConfirmation">Conferma che vuoi eliminare questa carta.</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -54,4 +54,7 @@
    <string name="enterBarcodeInstructions">Voer de waarde van de barcode in en kies daarna de afbeelding die de barcode die je wil gebruiken representeert</string>
    <string name="copy_to_clipboard">Kopieer het ID naar het klembord</string>
    <string name="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</string>
+    <string name="confirm">Bevestig</string>
+    <string name="deleteConfirmation">Bevestig deze kaart te verwijderen.</string>
+    <string name="deleteTitle">Verwijder kaart</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,9 @@
    <string name="enterCard">Enter Card</string>
    <string name="edit">Edit</string>
    <string name="delete">Delete</string>
+    <string name="confirm">Confirm</string>
+    <string name="deleteTitle">Remove Loyalty Card</string>
+    <string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Copy ID to clipboard</string>

@@ -59,4 +62,4 @@

    <string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>

-</resources>
+</resources>
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -109,7 +109,7 @@ public class ImportExportTest
    @Test
    public void multipleCardsExportImport() throws IOException
    {
-        final int NUM_CARDS = 1000;
+        final int NUM_CARDS = 10;

        for(DataFormat format : DataFormat.values())
        {
@@ -144,7 +144,7 @@ public class ImportExportTest
    @Test
    public void importExistingCardsNotReplace() throws IOException
    {
-        final int NUM_CARDS = 1000;
+        final int NUM_CARDS = 10;

        for(DataFormat format : DataFormat.values())
        {
@@ -177,7 +177,7 @@ public class ImportExportTest
    @Test
    public void corruptedImportNothingSaved() throws IOException
    {
-        final int NUM_CARDS = 1000;
+        final int NUM_CARDS = 10;

        for(DataFormat format : DataFormat.values())
        {
Author	SHA1	Message	Date
Branden Archer	151b81daa7	Merge pull request #69 from brarcher/pre-v0.8 Update for release 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
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