Merge pull request #9 from brarcher/pre-v0.2

Update version information for release
2025-12-25 08:07:56 -05:00 · 2016-02-07 22:00:49 -05:00 · 2016-02-07 21:56:02 -05:00 · 2016-02-07 15:51:10 -05:00 · 2016-02-07 15:38:07 -05:00 · 2016-02-07 15:37:40 -05:00
5 changed files with 47 additions and 6 deletions
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
 # Loyalty Card Locker
 [![Build Status](https://travis-ci.org/brarcher/loyalty-card-locker.svg?branch=master)](https://travis-ci.org/brarcher/loyalty-card-locker)

+[![F-Droid](https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Get_it_on_F-Droid.svg/160px-Get_it_on_F-Droid.svg.png)](https://f-droid.org/repository/browse/?fdid=protect.card_locker "Loyalty Card Locker on F-Droid")
+
+
 Stores all of your store loyalty cards on your phone, removing the need to carry them around.  

 If there is any interest in improving this project, kindly submit a pull request with
-proposed changed.
+proposed changes.

 # Thanks

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 17
        targetSdkVersion 23
-        versionCode 1
-        versionName "0.1"
+        versionCode 2
+        versionName "0.2"
    }
    buildTypes {
        release {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,18 @@
 <manifest package="protect.card_locker"
          xmlns:android="http://schemas.android.com/apk/res/android">

-    <uses-feature android:required="true" android:name="android.hardware.camera"/>
-    <uses-permission android:maxSdkVersion="18" android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission
+        android:name="android.permission.CAMERA"/>
+    <uses-permission
+        android:maxSdkVersion="18"
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />

    <application
        android:allowBackup="false"
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -170,7 +170,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
            public void onClick(View v)
            {
                IntentIntegrator integrator = new IntentIntegrator(LoyaltyCardViewActivity.this);
-                integrator.setDesiredBarcodeFormats(IntentIntegrator.PRODUCT_CODE_TYPES);
+                integrator.setDesiredBarcodeFormats(IntentIntegrator.ONE_D_CODE_TYPES);

                String prompt = getResources().getString(R.string.scanCardBarcode);
                integrator.setPrompt(prompt);
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,28 @@
+<resources>
+    <string name="app_name">Carte fedeltà</string>
+    <string name="action_add">Aggiungi</string>
+
+    <string name="noGiftCards">Non hai ancora alcuna tessera fedeltà al momento. Premi sul bottone "+" (più) in alto per incominciare.\n\nL\'app ti permette di portare con te le tue tessere fedeltà, così da averle sempre a disposizione.</string>
+
+    <string name="storeName">Negozio</string>
+    <string name="cardId">Codice</string>
+    <string name="barcodeType">Tipo codice a barre</string>
+
+    <string name="cancel">Annulla</string>
+    <string name="save">Salva</string>
+    <string name="capture">Salva tessera</string>
+    <string name="edit">Modifica</string>
+    <string name="delete">Elimina</string>
+
+    <string name="editCardTitle">Modifica carta</string>
+    <string name="addCardTitle">Aggiungi carta</string>
+    <string name="viewCardTitle">Mostra carta</string>
+    <string name="scanCardBarcode">Scansiona codice carta</string>
+
+    <string name="barcodeImageDescription">Immagine del codice a barre della carta</string>
+
+    <string name="noStoreError">Nessun negozio inserito</string>
+    <string name="noCardIdError">Nessun codice carta inserito</string>
+
+    <string name="cardIdFormat">%1$s: %2$s</string>
+</resources>
Author	SHA1	Message	Date
Branden Archer	dd0bb18234	Merge pull request #9 from brarcher/pre-v0.2 Update version information for release	2016-02-07 22:00:49 -05:00
Branden Archer	35c778eadc	Update version information for release	2016-02-07 21:56:02 -05:00
Branden Archer	63e0356ddd	Merge pull request #8 from brarcher/camera-permission Camera permission	2016-02-07 15:51:10 -05:00
Branden Archer	9820bca315	declare usage of the auto focus feature for the camera The zxing library will attempt to use auto focus on the camera, if available.	2016-02-07 15:38:07 -05:00
Branden Archer	2e457dc06e	Add permission for using camera The zxing library will need this permission to work correctly.	2016-02-07 15:37:40 -05:00
Branden Archer	8bfd0f1215	Use multiple lines to declare features and permissions This is for readability.	2016-02-07 15:37:15 -05:00
Branden Archer	cdbbf9222a	Merge pull request #7 from brarcher/1d-barcodes Support scanning all types of 1D barcodes	2016-02-03 15:16:47 -05:00
Branden Archer	96c665a539	Support scanning all types of 1D barcodes There are loyalty cards which are not product codes but are 1D barcodes. Enabling support for all types of 1D barcodes to enable more types of loyalty cards.	2016-02-03 15:09:54 -05:00
Branden Archer	c0e8a33605	Merge pull request #6 from brarcher/readme Add F-Droid icon and fix grammer in README.md	2016-02-02 22:51:48 -05:00
Branden Archer	fb96dfc8ac	Add F-Droid icon and fix grammer in README.md	2016-02-02 22:27:20 -05:00
Branden Archer	41590706b5	Merge pull request #2 from Airon90/patch-1 Create strings.xml for Italian translation	2016-01-31 14:24:15 -05:00
Michael Moroni	59a7976ad5	Update strings.xml fix	2016-01-31 14:35:16 +01:00
Michael Moroni	281fc30418	Create strings.xml Added Italian translation	2016-01-31 14:09:37 +01:00